shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

help: align option list in pv/lv/vgchange cases

Browse Source 
Align one-required options like is done for
optional options.
This commit is contained in:
David Teigland 2017-03-17 11:20:51 -05:00
parent fec2ea76cf
commit 8d7be8f5df
1 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
tools/command.c
View File

@ -1708,7 +1708,62 @@ void print_usage(struct command *cmd, int longhelp, int desc_first)
printf(" %s", cmd->name); printf(" %s", cmd->name);
if (cmd->ro_count) { if (onereq && cmd->ro_count) {
/* one required option in a set */
first = 1;
/* options with short and long */
for (ro = 0; ro < cmd->ro_count; ro++) {
opt_enum = cmd->required_opt_args[ro].opt;
if (!opt_names[opt_enum].short_opt)
continue;
if ((opt_enum == size_ARG) && command_has_alternate_extents(cmd->name))
include_extents = 1;
if (first)
printf("\n\t(");
else
printf(",\n\t ");
first = 0;
printf(" -%c|%s", opt_names[opt_enum].short_opt, opt_names[opt_enum].long_opt);
if (cmd->required_opt_args[ro].def.val_bits) {
printf(" ");
print_usage_def(cmd, opt_enum, &cmd->required_opt_args[ro].def);
}
}
/* options with only long */
for (ro = 0; ro < cmd->ro_count; ro++) {
opt_enum = cmd->required_opt_args[ro].opt;
if (opt_names[opt_enum].short_opt)
continue;
if ((opt_enum == size_ARG) && command_has_alternate_extents(cmd->name))
include_extents = 1;
if (first)
printf("\n\t(");
else
printf(",\n\t ");
first = 0;
printf(" %s", opt_names[opt_enum].long_opt);
if (cmd->required_opt_args[ro].def.val_bits) {
printf(" ");
print_usage_def(cmd, opt_enum, &cmd->required_opt_args[ro].def);
}
}
printf(" )\n");
}
if (!onereq && cmd->ro_count) {
first = 1; first = 1;
for (ro = 0; ro < cmd->ro_count; ro++) { for (ro = 0; ro < cmd->ro_count; ro++) {
@ -1717,14 +1772,6 @@ void print_usage(struct command *cmd, int longhelp, int desc_first)
if ((opt_enum == size_ARG) && command_has_alternate_extents(cmd->name)) if ((opt_enum == size_ARG) && command_has_alternate_extents(cmd->name))
include_extents = 1; include_extents = 1;
if (onereq) {
if (first)
printf("\n\t(");
else
printf(",\n\t ");
first = 0;
}
if (opt_names[opt_enum].short_opt) if (opt_names[opt_enum].short_opt)
printf(" -%c|%s", opt_names[opt_enum].short_opt, opt_names[opt_enum].long_opt); printf(" -%c|%s", opt_names[opt_enum].short_opt, opt_names[opt_enum].long_opt);
else else
@ -1735,9 +1782,6 @@ void print_usage(struct command *cmd, int longhelp, int desc_first)
print_usage_def(cmd, opt_enum, &cmd->required_opt_args[ro].def); print_usage_def(cmd, opt_enum, &cmd->required_opt_args[ro].def);
} }
} }
if (onereq)
printf(" )\n");
} }
if (cmd->rp_count) { if (cmd->rp_count) {