diff options
| author | Sami Kerola <kerolasa@iki.fi> | 2012-03-15 22:58:09 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2012-03-30 16:48:11 +0200 |
| commit | efe030d66c1c8a892bec165e2d181ef157117f11 (patch) | |
| tree | 6ffb4c85fdd2e2b8dc4727a4d54231eed5fd7ee9 | |
| parent | 5cc12c4090698e6a67f7645228fc5db66f79c279 (diff) | |
| download | util-linux-efe030d66c1c8a892bec165e2d181ef157117f11.tar.gz | |
findfs: add --version & align with howto-usage-function.txt
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| -rw-r--r-- | misc-utils/findfs.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/misc-utils/findfs.c b/misc-utils/findfs.c index 04651b3a..761c6e91 100644 --- a/misc-utils/findfs.c +++ b/misc-utils/findfs.c @@ -16,12 +16,15 @@ static void __attribute__((__noreturn__)) usage(int rc) { - const char *p = program_invocation_short_name; - - if (!p) - p = "findfs"; - - fprintf(stderr, _("Usage: %s LABEL=<label>|UUID=<uuid>\n"), p); + FILE *out = rc ? stderr : stdout; + fputs(USAGE_HEADER, out); + fprintf(out, _(" %1$s [options] LABEL=<label>\n" + " %1$s [options] UUID=<uuid>\n"), + program_invocation_short_name); + fputs(USAGE_OPTIONS, out); + fputs(USAGE_HELP, out); + fputs(USAGE_VERSION, out); + fprintf(out, USAGE_MAN_TAIL("findfs(8)")); exit(rc); } @@ -44,8 +47,12 @@ int main(int argc, char **argv) } else if (!strncmp(argv[1], "UUID=", 5)) { tk = "UUID"; vl = argv[1] + 5; - } else if (!strcmp(argv[1], "-h") == 0 || - !strcmp(argv[1], "--help") == 0) { + } else if (strcmp(argv[1], "-V") == 0 || + strcmp(argv[1], "--version") == 0) { + printf(UTIL_LINUX_VERSION); + return EXIT_SUCCESS; + } else if (strcmp(argv[1], "-h") == 0 || + strcmp(argv[1], "--help") == 0) { usage(EXIT_SUCCESS); } else usage(2); |