From de4786090f85ee2cfbfdc8882fd5712b96ee5127 Mon Sep 17 00:00:00 2001 From: ERAMOTO Masaya Date: Mon, 19 Jun 2017 20:26:36 +0900 Subject: [PATCH] client: Output a long message by two lines This outputs the help message by two lines as follows if the string of a command and a argument is long. set-alias Set device alias select-attribute Select attribute attribute-info [attribute/UUID] Select attribute read Read attribute value --- client/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/main.c b/client/main.c index 3cb4ad5a0..578dde9b7 100644 --- a/client/main.c +++ b/client/main.c @@ -2262,10 +2262,18 @@ static void cmd_help(const char *arg) printf("Available commands:\n"); for (i = 0; cmd_table[i].cmd; i++) { - printf(" %s %-*s %s\n", cmd_table[i].cmd, + if ((int)strlen(cmd_table[i].arg? : "") <= + (int)(25 - strlen(cmd_table[i].cmd))) + printf(" %s %-*s %s\n", cmd_table[i].cmd, (int)(25 - strlen(cmd_table[i].cmd)), cmd_table[i].arg ? : "", cmd_table[i].desc ? : ""); + else + printf(" %s %-s\n" " %s %-25s %s\n", + cmd_table[i].cmd, + cmd_table[i].arg ? : "", + "", "", + cmd_table[i].desc ? : ""); } } -- 2.47.3