path: root/help.c
diff options
authorDavid Sterba <>2015-06-08 23:30:21 +0200
committerDavid Sterba <>2015-06-09 13:32:32 +0200
commit54003d7ee6c71011ec41a5e4e557ec6c83a831de (patch)
tree460d37aec4b614740bd3c87a43f1786e992c561b /help.c
parente99303c381b4041f8b5fce6f757242c5f1162c76 (diff)
btrfs-progs: fix argv0_buf handling
The variable argv0_buf was duplicated and the changes done in utils.c were not propagated to help.c. So if an unknown commandline token was found, the error message did not contain the known part: $ btrfs scrub test : unknown token 'test' instead of $ btrfs scrub test btrfs scrub: uknown token 'test' Signed-off-by: David Sterba <>
Diffstat (limited to 'help.c')
1 files changed, 2 insertions, 4 deletions
diff --git a/help.c b/help.c
index 56aaf9c3..56aded3a 100644
--- a/help.c
+++ b/help.c
@@ -22,8 +22,6 @@
#include "commands.h"
#include "utils.h"
-static char argv0_buf[ARGV0_BUF_SIZE];
#define USAGE_SHORT 1U
#define USAGE_LONG 2U
@@ -183,7 +181,7 @@ void usage_command_group(const struct cmd_group *grp, int full, int err)
void help_unknown_token(const char *arg, const struct cmd_group *grp)
- fprintf(stderr, "%s: unknown token '%s'\n", argv0_buf, arg);
+ fprintf(stderr, "%s: unknown token '%s'\n", get_argv0_buf(), arg);
usage_command_group(grp, 0, 1);
@@ -192,7 +190,7 @@ void help_ambiguous_token(const char *arg, const struct cmd_group *grp)
const struct cmd_struct *cmd = grp->commands;
- fprintf(stderr, "%s: ambiguous token '%s'\n", argv0_buf, arg);
+ fprintf(stderr, "%s: ambiguous token '%s'\n", get_argv0_buf(), arg);
fprintf(stderr, "\nDid you mean one of these ?\n");
for (; cmd->token; cmd++) {