auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

command: let 'help' and 'usage' to use command_print()

Browse Source 
The commands 'help' and 'usage' still rely on LOG_USER_N() and
LOG_USER() for the output.

Convert them to command_print().

Change-Id: I6e77dd761b61344ff797f661456896388bba89aa
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/9184
Reviewed-by: Evgeniy Naydanov <eugnay@gmail.com>
Tested-by: jenkins
This commit is contained in:
Antonio Borneo
2025-10-23 23:27:45 +02:00
parent 3e7a7092d4
commit 586c8981b1
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/helper/command.c
View File

@@ -674,12 +674,13 @@ static COMMAND_HELPER(command_help_show_list, bool show_help, const char *cmd_ma
#define HELP_LINE_WIDTH(_n) (int)(76 - (2 * _n))
static void command_help_show_indent(unsigned int n)
static void command_help_show_indent(struct command_invocation *cmd, unsigned int n)
{
for (unsigned int i = 0; i < n; i++)
LOG_USER_N(" ");
command_print_sameline(cmd, " ");
}
static void command_help_show_wrap(const char *str, unsigned int n, unsigned int n2)
static void command_help_show_wrap(struct command_invocation *cmd,
const char *str, unsigned int n, unsigned int n2)
{
const char *cp = str, *last = str;
while (*cp) {
@@ -692,8 +693,8 @@ static void command_help_show_wrap(const char *str, unsigned int n, unsigned int
} while ((next - last < HELP_LINE_WIDTH(n)) && *next != '\0');
if (next - last < HELP_LINE_WIDTH(n))
cp = next;
command_help_show_indent(n);
LOG_USER("%.*s", (int)(cp - last), last);
command_help_show_indent(cmd, n);
command_print(cmd, "%.*s", (int)(cp - last), last);
last = cp + 1;
n = n2;
}
@@ -715,10 +716,10 @@ static COMMAND_HELPER(command_help_show, struct help_entry *c,
if (is_match) {
if (c->usage && strlen(c->usage) > 0) {
char *msg = alloc_printf("%s %s", c->cmd_name, c->usage);
command_help_show_wrap(msg, n, n + 5);
command_help_show_wrap(CMD, msg, n, n + 5);
free(msg);
} else {
command_help_show_wrap(c->cmd_name, n, n + 5);
command_help_show_wrap(CMD, c->cmd_name, n, n + 5);
}
}
@@ -752,7 +753,7 @@ static COMMAND_HELPER(command_help_show, struct help_entry *c,
return ERROR_FAIL;
}
command_help_show_wrap(msg, n + 3, n + 3);
command_help_show_wrap(CMD, msg, n + 3, n + 3);
free(msg);
}