From 8e8f4bf3fa16d3790a5eb74b8f07b904024ee9d8 Mon Sep 17 00:00:00 2001 From: Harpreet Kaur Lalwani Date: Wed, 21 Nov 2018 16:13:36 +0530 Subject: cli: "usage()" and "--help" for gluster cli Added a usage message which will be shown when a user enters an "unrecognized word" or an "unrecognized command" on the cli. Also added a "--help" option for gluster cli. fixes: bz#1535495 Change-Id: Ibcfb3d1c84daa1054e09c5cdfa6a5dab19f534a6 Signed-off-by: Harpreet Kaur Lalwani --- cli/src/cli.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'cli/src/cli.c') diff --git a/cli/src/cli.c b/cli/src/cli.c index 3716d2a89ca..99fe6f1612c 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -320,6 +320,20 @@ cli_opt_parse(char *opt, struct cli_state *state) if (strcmp(opt, "") == 0) return 1; + if (strcmp(opt, "help") == 0) { + cli_out( + " peer help - display help for peer commands\n" + " volume help - display help for volume commands\n" + " volume bitrot help - display help for volume" + " bitrot commands\n" + " volume quota help - display help for volume" + " quota commands\n" + " volume tier help - display help for volume" + " tier commands\n" + " snapshot help - display help for snapshot commands\n" + " global help - list global commands\n"); + exit(0); + } if (strcmp(opt, "version") == 0) { cli_out("%s", argp_program_version); @@ -454,7 +468,8 @@ parse_cmdline(int argc, char *argv[], struct cli_state *state) continue; ret = cli_opt_parse(opt, state); if (ret == -1) { - cli_out("unrecognized option --%s", opt); + cli_out("unrecognized option --%s\n", opt); + usage(); return ret; } else if (ret == -2) { return ret; -- cgit