elvtune, isosize: print usage text in case of invalid option

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>

diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c
index 1cf2fa82ef6b819ce70d11a49c4f48e5398ee399..7d8fe7b8e3923507e5a6bd645234b16098996b6e 100644 (file)
--- a/disk-utils/elvtune.c
+++ b/disk-utils/elvtune.c
@@ -99,7 +99,7 @@ main(int argc, char * argv[]) {
                        version(), exit(0);
 
                default:
-                       exit(1);
+                       usage(), exit(1);
                }
        }
 

diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index cba107c829139bd9741900ad4e2ef10c7a7eebfd..7857a22a15e8d71889a46e2ae1355cd6c0cd7724 100644 (file)
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -154,6 +154,14 @@ isosize(char *filenamep) {
        close(fd);
 }
 
+static void __attribute__((__noreturn__)) usage(FILE *out)
+{
+       fprintf(out, _("Usage: %s [-x] [-d <num>] iso9660-image\n"),
+               program_invocation_short_name);
+
+       exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
 int
 main(int argc, char * argv[]) {
        int j, ct;
@@ -166,7 +174,7 @@ main(int argc, char * argv[]) {
        if (argc >= 2 &&
            (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
                printf(_("%s (%s)\n"), program_invocation_short_name, PACKAGE_STRING);
-               exit(0);
+               return EXIT_SUCCESS;
        }
 
        for (;;) {
@@ -183,16 +191,14 @@ main(int argc, char * argv[]) {
                        xflag = 1;
                        break;
                default:
-                       exit(1);
+                       usage(stderr);
                }
        }
 
        ct = argc - optind;
 
        if (ct <= 0) {
-               fprintf(stderr, _("Usage: %s [-x] [-d <num>] iso9660-image\n"),
-                       program_invocation_short_name);
-               exit(1);
+               usage(stderr);
        }
 
        for (j = optind; j < argc; j++) {