shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Add --help dmsetup option as the synonym for help command.

Browse Source
This commit is contained in:
Milan Broz 2010-03-08 16:05:07 +00:00
parent ab5933d4ac
commit c948101ccd
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,6 +1,7 @@
Version 1.02.45 - Version 1.02.45 -
==================================== ====================================
Add --showkeys parameter description into dmsetup man page. Add --showkeys parameter description into dmsetup man page.
Add --help option as the synonym for help command.
Version 1.02.44 - 15th February 2010 Version 1.02.44 - 15th February 2010
==================================== ====================================

4
man/dmsetup.8.in
View File

@ -112,6 +112,10 @@ Invoking the command as \fBdevmap_name\fP is equivalent to
.IP \fB-c|-C|--columns .IP \fB-c|-C|--columns
.br .br
Display output in columns rather than as Field: Value lines. Display output in columns rather than as Field: Value lines.
.IP \fB-h|--help
.br
Outputs a summary of the commands available, optionally including
the list of report fields (synonym with \fBhelp\fP command).
.IP \fB--inactive .IP \fB--inactive
.br .br
When returning any table information from the kernel report on the When returning any table information from the kernel report on the

14
tools/dmsetup.c
View File

@ -124,6 +124,7 @@ enum {
EXEC_ARG, EXEC_ARG,
FORCE_ARG, FORCE_ARG,
GID_ARG, GID_ARG,
HELP_ARG,
INACTIVE_ARG, INACTIVE_ARG,
MAJOR_ARG, MAJOR_ARG,
MINOR_ARG, MINOR_ARG,
@ -2720,7 +2721,8 @@ static void _usage(FILE *out)
int i; int i;
fprintf(out, "Usage:\n\n"); fprintf(out, "Usage:\n\n");
fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n" fprintf(out, "dmsetup [--version] [-h|--help [-c|-C|--columns]]\n"
" [-v|--verbose [-v|--verbose ...]]\n"
" [-r|--readonly] [--noopencount] [--nolockfs] [--inactive]\n" " [-r|--readonly] [--noopencount] [--nolockfs] [--inactive]\n"
" [--udevcookie] [--noudevrules] [--noudevsync] [-y|--yes]\n" " [--udevcookie] [--noudevrules] [--noudevsync] [-y|--yes]\n"
" [--readahead [+]<sectors>|auto|none]\n" " [--readahead [+]<sectors>|auto|none]\n"
@ -3083,6 +3085,7 @@ static int _process_switches(int *argc, char ***argv, const char *dev_dir)
{"exec", 1, &ind, EXEC_ARG}, {"exec", 1, &ind, EXEC_ARG},
{"force", 0, &ind, FORCE_ARG}, {"force", 0, &ind, FORCE_ARG},
{"gid", 1, &ind, GID_ARG}, {"gid", 1, &ind, GID_ARG},
{"help", 0, &ind, HELP_ARG},
{"inactive", 0, &ind, INACTIVE_ARG}, {"inactive", 0, &ind, INACTIVE_ARG},
{"major", 1, &ind, MAJOR_ARG}, {"major", 1, &ind, MAJOR_ARG},
{"minor", 1, &ind, MINOR_ARG}, {"minor", 1, &ind, MINOR_ARG},
@ -3167,10 +3170,12 @@ static int _process_switches(int *argc, char ***argv, const char *dev_dir)
optarg = 0; optarg = 0;
optind = OPTIND_INIT; optind = OPTIND_INIT;
while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCfG:j:m:M:no:O:ru:U:vy", while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCfG:hj:m:M:no:O:ru:U:vy",
long_options, NULL)) != -1) { long_options, NULL)) != -1) {
if (c == ':' || c == '?') if (c == ':' || c == '?')
return 0; return 0;
if (c == 'h' || ind == HELP_ARG)
_switches[HELP_ARG]++;
if (c == 'c' || c == 'C' || ind == COLS_ARG) if (c == 'c' || c == 'C' || ind == COLS_ARG)
_switches[COLS_ARG]++; _switches[COLS_ARG]++;
if (c == 'f' || ind == FORCE_ARG) if (c == 'f' || ind == FORCE_ARG)
@ -3329,6 +3334,11 @@ int main(int argc, char **argv)
goto out; goto out;
} }
if (_switches[HELP_ARG]) {
c = _find_command("help");
goto doit;
}
if (_switches[VERSION_ARG]) { if (_switches[VERSION_ARG]) {
c = _find_command("version"); c = _find_command("version");
goto doit; goto doit;