From 1e6e4c5e5c8313a877881f800f07dcdd7bee5dd2 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 7 Dec 2003 02:28:24 -0500 Subject: [PATCH] mke2fs.c (PRS): Fix mke2fs -V so that it prints the version banner. --- misc/ChangeLog | 2 ++ misc/mke2fs.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/misc/ChangeLog b/misc/ChangeLog index 74ab9ed..f5e5a6a 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,5 +1,7 @@ 2003-12-07 Theodore Ts'o + * 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 e225d00..fd912c9 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); -- 1.8.3.1