mke2fs: sort option parsing, deprecate "-R"

A minor cleanup to order the command-line option parsing in
alphabetical order, except for "-E" and "-R", which need to
be co-located.

Print a message that the "-R" option is deprecated.  It has
been deprecated since 2005 (commit c6a44136b9b).

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index fef25ee..9b49ea0 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1355,6 +1355,16 @@ profile_error:
                case 'D':
                        direct_io = 1;
                        break;
+               case 'R':
+                       com_err(program_name, 0,
+                               _("'-R' is deprecated, use '-E' instead"));
+                       /* fallthrough */
+               case 'E':
+                       extended_opts = optarg;
+                       break;
+               case 'F':
+                       force++;
+                       break;
                case 'g':
                        fs_param.s_blocks_per_group = strtoul(optarg, &tmp, 0);
                        if (*tmp) {
@@ -1394,6 +1404,18 @@ profile_error:
                                exit(1);
                        }
                        break;
+               case 'I':
+                       inode_size = strtoul(optarg, &tmp, 0);
+                       if (*tmp) {
+                               com_err(program_name, 0,
+                                       _("invalid inode size - %s"), optarg);
+                               exit(1);
+                       }
+                       break;
+               case 'j':
+                       if (!journal_size)
+                               journal_size = -1;
+                       break;
                case 'J':
                        parse_journal_opts(optarg);
                        break;
@@ -1404,10 +1426,6 @@ profile_error:
                                          "instead!\n"));
                        discard = 0;
                        break;
-               case 'j':
-                       if (!journal_size)
-                               journal_size = -1;
-                       break;
                case 'l':
                        bad_blocks_filename = malloc(strlen(optarg)+1);
                        if (!bad_blocks_filename) {
@@ -1417,6 +1435,9 @@ profile_error:
                        }
                        strcpy(bad_blocks_filename, optarg);
                        break;
+               case 'L':
+                       volume_label = optarg;
+                       break;
                case 'm':
                        reserved_ratio = strtod(optarg, &tmp);
                        if ( *tmp || reserved_ratio > 50 ||
@@ -1427,12 +1448,26 @@ profile_error:
                                exit(1);
                        }
                        break;
+               case 'M':
+                       mount_dir = optarg;
+                       break;
                case 'n':
                        noaction++;
                        break;
+               case 'N':
+                       num_inodes = strtoul(optarg, &tmp, 0);
+                       if (*tmp) {
+                               com_err(program_name, 0,
+                                       _("bad num inodes - %s"), optarg);
+                                       exit(1);
+                       }
+                       break;
                case 'o':
                        creator_os = optarg;
                        break;
+               case 'O':
+                       fs_features = optarg;
+                       break;
                case 'q':
                        quiet = 1;
                        break;
@@ -1448,41 +1483,6 @@ profile_error:
                case 's':       /* deprecated */
                        s_opt = atoi(optarg);
                        break;
-               case 'I':
-                       inode_size = strtoul(optarg, &tmp, 0);
-                       if (*tmp) {
-                               com_err(program_name, 0,
-                                       _("invalid inode size - %s"), optarg);
-                               exit(1);
-                       }
-                       break;
-               case 'v':
-                       verbose = 1;
-                       break;
-               case 'F':
-                       force++;
-                       break;
-               case 'L':
-                       volume_label = optarg;
-                       break;
-               case 'M':
-                       mount_dir = optarg;
-                       break;
-               case 'N':
-                       num_inodes = strtoul(optarg, &tmp, 0);
-                       if (*tmp) {
-                               com_err(program_name, 0,
-                                       _("bad num inodes - %s"), optarg);
-                                       exit(1);
-                       }
-                       break;
-               case 'O':
-                       fs_features = optarg;
-                       break;
-               case 'E':
-               case 'R':
-                       extended_opts = optarg;
-                       break;
                case 'S':
                        super_only = 1;
                        break;
@@ -1505,6 +1505,9 @@ profile_error:
                case 'U':
                        fs_uuid = optarg;
                        break;
+               case 'v':
+                       verbose = 1;
+                       break;
                case 'V':
                        /* Print version number and exit */
                        show_version_only++;

diff --git a/tests/m_raid_opt/script b/tests/m_raid_opt/script
index 1e47cc1..296fe94 100644 (file)
--- a/tests/m_raid_opt/script
+++ b/tests/m_raid_opt/script
@@ -1,4 +1,4 @@
 DESCRIPTION="raid options"
 FS_SIZE=131072
-MKE2FS_OPTS="-R stride=13 -O sparse_super -g 1024"
+MKE2FS_OPTS="-E stride=13 -O sparse_super -g 1024"
 . $cmd_dir/run_mke2fs