Give an error if -O is specified more than once to tune2fs.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 8cedc0602edc867bb4b818e0bd9270ab6f4f5a76..238616cf049083e3b30fac85d79d97b65a80a51d 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-15  Theodore Tso  <tytso@valinux.com>
+
+       * tune2fs.c (parse_tune2fs_options): Give an error if -O is
+               specified more than once.
+
 2001-08-10  Theodore Tso  <tytso@valinux.com>
 
        * mke2fs.8.in: Slim down text describing the -O flag to remove

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 0ec0c66ac141b0b9f838d499d9dc49ae453217ef..c5067033067d64f762e1332aad2ae61e2873660d 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -550,6 +550,11 @@ static void parse_tune2fs_options(int argc, char **argv)
                                open_flag = EXT2_FLAG_RW;
                                break;
                        case 'O':
+                               if (features_cmd) {
+                                       com_err (program_name, 0,
+                                        _("-O may only be specified once"));
+                                       usage();
+                               }
                                features_cmd = optarg;
                                open_flag = EXT2_FLAG_RW;
                                break;