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

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 74ab9ed7e45ef9fc1449489c4907427cb4abf23c..f5e5a6af44ad7ac4250964c1f8a141873a4764bc 100644 (file)
--- 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 e225d009445a9fd71c66eb98b659a20eb46291e6..fd912c9233ce35cfdce0160b5c6fdeb97010cd29 100644 (file)
--- 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);