From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 7 Dec 2003 07:28:24 +0000 (-0500)
Subject: mke2fs.c (PRS): Fix mke2fs -V so that it prints the version banner.
X-Git-Tag: E2FSPROGS-1_35-WIP-1207~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e6e4c5e5c8313a877881f800f07dcdd7bee5dd2;p=thirdparty%2Fe2fsprogs.git

mke2fs.c (PRS): Fix mke2fs -V so that it prints the version banner.
---

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 74ab9ed7e..f5e5a6af4 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,7 @@
 2003-12-07  Theodore Ts'o  <tytso@mit.edu>
 
+	* mke2fs.c (PRS): Fix mke2fs -V so that it prints the version banner.
+
 	* badblocks.c, blkid.c, chattr.c, dumpe2fs.c, e2image.c, fsck.c,
 		fsck.h, lsattr.c, mke2fs.c, nls-enable.h, tune2fs.c,
 		util.c: Fix gcc -Wall nitpicks.
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index e225d0094..fd912c923 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -811,6 +811,7 @@ static void PRS(int argc, char *argv[])
 	int		inode_size = 0;
 	int		reserved_ratio = 5;
 	int		sector_size = 0;
+	int		show_version_only = 0;
 	ext2_ino_t	num_inodes = 0;
 	errcode_t	retval;
 	char *		oldpath = getenv("PATH");
@@ -1054,13 +1055,12 @@ static void PRS(int argc, char *argv[])
 			break;
 		case 'V':
 			/* Print version number and exit */
-			fprintf(stderr, _("\tUsing %s\n"),
-				error_message(EXT2_ET_BASE));
-			exit(0);
+			show_version_only++;
+			break;
 		default:
 			usage();
 		}
-	if (optind == argc)
+	if ((optind == argc) && !show_version_only)
 		usage();
 	device_name = argv[optind];
 	optind++;
@@ -1077,10 +1077,16 @@ static void PRS(int argc, char *argv[])
 	if (optind < argc)
 		usage();
 
-	if (!quiet)
+	if (!quiet || show_version_only)
 		fprintf (stderr, "mke2fs %s (%s)\n", E2FSPROGS_VERSION, 
 			 E2FSPROGS_DATE);
 
+	if (show_version_only) {
+		fprintf(stderr, _("\tUsing %s\n"), 
+			error_message(EXT2_ET_BASE));
+		exit(0);
+	}
+
 	if (raid_opts)
 		parse_raid_opts(raid_opts);