shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-28 02:50:41 +03:00
Code Releases Activity

help: avoid end notes repetition in lvm help all

Browse Source
This commit is contained in:
David Teigland 2017-03-07 12:01:06 -06:00
parent ed58672029
commit f48e6b2690
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/command.c
View File

@ -1989,9 +1989,9 @@ void print_usage_common_cmd(struct command_name *cname, struct command *cmd)
printf("\n\n");
}
void print_usage_notes(struct command_name *cname, struct command *cmd)
void print_usage_notes(struct command_name *cname)
{
if (command_has_alternate_extents(cname->name)) {
if (cname && command_has_alternate_extents(cname->name)) {
printf(" Special options for command:\n");
printf(" [ --extents Number[PERCENT] ]\n"
" The --extents option can be used in place of --size.\n"
@ -1999,7 +1999,7 @@ void print_usage_notes(struct command_name *cname, struct command *cmd)
printf("\n");
}
if (!strcmp(cname->name, "lvcreate")) {
if (cname && !strcmp(cname->name, "lvcreate")) {
printf(" [ --name String ]\n"
" The --name option is not required but is typically used.\n"
" When a name is not specified, a new LV name is generated\n"

2
tools/command.h
View File

@ -216,7 +216,7 @@ int command_id_to_enum(const char *str);
void print_usage(struct command *cmd, int longhelp, int desc_first);
void print_usage_common_cmd(struct command_name *cname, struct command *cmd);
void print_usage_common_lvm(struct command_name *cname, struct command *cmd);
void print_usage_notes(struct command_name *cname, struct command *cmd);
void print_usage_notes(struct command_name *cname);
void factor_common_options(void);
int command_has_alternate_extents(const char *name);

15
tools/lvmcmdline.c
View File

@ -1694,7 +1694,7 @@ static void _short_usage(const char *name)
log_error("Run `%s --help' for more information.", name);
}
static int _usage(const char *name, int longhelp)
static int _usage(const char *name, int longhelp, int skip_notes)
{
struct command_name *cname = find_command_name(name);
struct command *cmd;
@ -1739,8 +1739,11 @@ static int _usage(const char *name, int longhelp)
print_usage_common_lvm(cname, cmd);
}
if (skip_notes)
return 1;
if (longhelp)
print_usage_notes(cname, cmd);
print_usage_notes(cname);
else
log_print("Use --longhelp to show all options and advanced commands.");
@ -1754,8 +1757,10 @@ static void _usage_all(void)
for (i = 0; i < MAX_COMMAND_NAMES; i++) {
if (!command_names[i].name)
break;
_usage(command_names[i].name, 1);
_usage(command_names[i].name, 1, 1);
}
print_usage_notes(NULL);
}
/*
@ -2202,7 +2207,7 @@ static int _process_common_commands(struct cmd_context *cmd)
if (arg_is_set(cmd, help_ARG) ||
arg_is_set(cmd, longhelp_ARG) ||
arg_is_set(cmd, help2_ARG)) {
_usage(cmd->name, arg_is_set(cmd, longhelp_ARG));
_usage(cmd->name, arg_is_set(cmd, longhelp_ARG), 0);
return ECMD_PROCESSED;
}
@ -2240,7 +2245,7 @@ int help(struct cmd_context *cmd __attribute__((unused)), int argc, char **argv)
else {
int i;
for (i = 0; i < argc; i++)
if (!_usage(argv[i], 0))
if (!_usage(argv[i], 0, 0))
ret = EINVALID_CMD_LINE;
}