]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
isosize: fix usage() -h option print out
authorSami Kerola <kerolasa@iki.fi>
Sun, 16 Dec 2012 10:43:53 +0000 (10:43 +0000)
committerKarel Zak <kzak@redhat.com>
Wed, 19 Dec 2012 10:05:02 +0000 (11:05 +0100)
Fixes usage() bug from commit 4eba43a7 which claimed sort option for
--help being -H.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
disk-utils/isosize.c

index e5defae29e0cfd7143f6fa921e372e059ad1be6c..625dd427e7baaf1fc5ff9ff5f884891d0395d5ca 100644 (file)
@@ -153,15 +153,17 @@ static void isosize(char *filenamep, int xflag, long divisor)
 
 static void __attribute__((__noreturn__)) usage(FILE *out)
 {
-       fprintf(out, _("\nUsage:\n"
-                      " %s [options] iso9660_image_file\n"),
+       fputs(USAGE_HEADER, out);
+       fprintf(out,
+               _(" %s [options] iso9660_image_file\n"),
                program_invocation_short_name);
-
-       fprintf(out, _("\nOptions:\n"
-                      " -d, --divisor=NUM      divide bytes NUM\n"
-                      " -x, --sectors          show sector count and size\n"
-                      " -V, --version          output version information and exit\n"
-                      " -H, --help             display this help and exit\n\n"));
+       fputs(USAGE_OPTIONS, out);
+       fputs(_(" -d, --divisor=NUM      divide bytes NUM\n"), out);
+       fputs(_(" -x, --sectors          show sector count and size\n"), out);
+       fputs(USAGE_SEPARATOR, out);
+       fputs(USAGE_HELP, out);
+       fputs(USAGE_VERSION, out);
+       fprintf(out, USAGE_MAN_TAIL("isosize(8)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
@@ -195,8 +197,7 @@ int main(int argc, char **argv)
                        xflag = 1;
                        break;
                case 'V':
-                       printf(_("%s (%s)\n"), program_invocation_short_name,
-                              PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'h':
                        usage(stdout);