From 7fb70440cff73c57a2b3a53f22a6ff023718ea39 Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Wed, 20 Jun 2018 08:38:38 +0800 Subject: btrfs-progs: Fix wrong optind re-initialization to allow mixed option and non-option In function handle_global_options(), we reset @optind to 1. However according to man page of getopt(3) NOTES section, if we need to rescan options later, @optind should be reset to 0 to initialize the internal variables correctly. This explains the reason why in cmd_check(), getopt_long() doesn't handle the following command correctly: "btrfs check /dev/data/btrfs --check-data-csum" While mkfs.btrfs handles mixed non-option and option correctly: "mkfs.btrfs -f /dev/data/disk1 --data raid1 /dev/data/disk2" Cc: Paul Jones Cc: Hugo Mills Fixes: 010ceab56e06 ("btrfs-progs: rework option parser to use getopt for global options") Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- cmds-restore.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cmds-restore.c') diff --git a/cmds-restore.c b/cmds-restore.c index 342f5cc7..2933b7f5 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -1440,6 +1440,7 @@ int cmd_restore(int argc, char **argv) regex_t match_reg, *mreg = NULL; char reg_err[256]; + optind = 0; while (1) { int opt; enum { GETOPT_VAL_PATH_REGEX = 256 }; -- cgit v1.2.3