From bb7ea8d81a139550d5c7283715ffd01960138689 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 16 Dec 2012 10:43:53 +0000 Subject: [PATCH] isosize: fix usage() -h option print out Fixes usage() bug from commit 4eba43a7 which claimed sort option for --help being -H. Signed-off-by: Sami Kerola --- disk-utils/isosize.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c index e5defae29..625dd427e 100644 --- a/disk-utils/isosize.c +++ b/disk-utils/isosize.c @@ -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);