[PATCH 4/4] elvtune, isosize: print usage text in case of invalid option

[Francesco Cosoleto <cosoleto@xxxxxxxxx>]

Signed-off-by: Francesco Cosoleto <cosoleto@xxxxxxxxx>
---
 disk-utils/elvtune.c |    2 +-
 disk-utils/isosize.c |   16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c
index 1cf2fa8..7d8fe7b 100644
--- 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 4583a5f..730237f 100644
--- 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++) {
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html