marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: Make option parsing more robust to code modifications 

The current approach to option parsing, where long-only options are
selected on the basis of their position in the long_options array is
fragile and painful to modify if options are to be inserted into the
list, rather than appended.

Instead, use the last field of struct option to return a value which
cannot be a char (and hence a short option), and simply switch on those
within the case statement.

Signed-off-by: Hugo Mills <hugo@carfax.org.uk>
Signed-off-by: David Sterba <dsterba@suse.cz>
master
Hugo Mills 2015-01-27 15:05:52 +00:00 committed by David Sterba
parent 1c93eb0089
commit 7c126f7afc
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cmds-check.c
View File

@ -8435,13 +8435,15 @@ int cmd_check(int argc, char **argv)
while(1) { while(1) {
int c; int c;
int option_index = 0; int option_index = 0;
enum { OPT_REPAIR = 257, OPT_INIT_CSUM, OPT_INIT_EXTENT,
OPT_CHECK_CSUM };
static const struct option long_options[] = { static const struct option long_options[] = {
{ "super", 1, NULL, 's' }, { "super", 1, NULL, 's' },
{ "repair", 0, NULL, 0 }, { "repair", 0, NULL, OPT_REPAIR },
{ "init-csum-tree", 0, NULL, 0 }, { "init-csum-tree", 0, NULL, OPT_INIT_CSUM },
{ "init-extent-tree", 0, NULL, 0 }, { "init-extent-tree", 0, NULL, OPT_INIT_EXTENT },
{ "check-data-csum", 0, NULL, 0 }, { "check-data-csum", 0, NULL, OPT_CHECK_CSUM },
{ "backup", 0, NULL, 0 }, { "backup", 0, NULL, 'b' },
{ "subvol-extents", 1, NULL, 'E' }, { "subvol-extents", 1, NULL, 'E' },
{ "qgroup-report", 0, NULL, 'Q' }, { "qgroup-report", 0, NULL, 'Q' },
{ "tree-root", 1, NULL, 'r' }, { "tree-root", 1, NULL, 'r' },
@ -8481,23 +8483,26 @@ int cmd_check(int argc, char **argv)
case '?': case '?':
case 'h': case 'h':
usage(cmd_check_usage); usage(cmd_check_usage);
} case OPT_REPAIR:
if (option_index == 1) { printf("enabling repair mode\n");
printf("enabling repair mode\n"); repair = 1;
repair = 1; ctree_flags |= OPEN_CTREE_WRITES;
ctree_flags |= OPEN_CTREE_WRITES; break;
} else if (option_index == 2) { case OPT_INIT_CSUM:
printf("Creating a new CRC tree\n"); printf("Creating a new CRC tree\n");
init_csum_tree = 1; init_csum_tree = 1;
repair = 1; repair = 1;
ctree_flags |= OPEN_CTREE_WRITES; ctree_flags |= OPEN_CTREE_WRITES;
} else if (option_index == 3) { break;
init_extent_tree = 1; case OPT_INIT_EXTENT:
ctree_flags |= (OPEN_CTREE_WRITES | init_extent_tree = 1;
OPEN_CTREE_NO_BLOCK_GROUPS); ctree_flags |= (OPEN_CTREE_WRITES |
repair = 1; OPEN_CTREE_NO_BLOCK_GROUPS);
} else if (option_index == 4) { repair = 1;
check_data_csum = 1; break;
case OPT_CHECK_CSUM:
check_data_csum = 1;
break;
} }
} }
argc = argc - optind; argc = argc - optind;