]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
fsck: Fix parsing of -r
authorStanislav Brabec <sbrabec@suse.cz>
Wed, 29 Apr 2015 16:49:47 +0000 (18:49 +0200)
committerKarel Zak <kzak@redhat.com>
Tue, 5 May 2015 10:28:41 +0000 (12:28 +0200)
Fix regression introduced by commit 658c089: -r cannot be used as a last
option:

fsck -r /dev/sda1
fsck: invalid argument -r: '/dev/sda1'

Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
disk-utils/fsck.c

index bd2bf36cae0f88493827f42a51709af6810981ae..465e6d36d25f142db370f55b80744482c0adb35a 100644 (file)
@@ -1525,7 +1525,7 @@ static void parse_argv(int argc, char *argv[])
                                if (arg[j+1]) {                                 /* -r<fd> */
                                        report_stats_fd = strtou32_or_err(arg+j+1, _("invalid argument -r"));
                                        goto next_arg;
-                               } else if (i+1 < argc && *argv[i+1] != '-') {   /* -r <fd> */
+                               } else if (i+1 < argc && *argv[i+1] >= '0' && *argv[i+1] <= '9') {      /* -r <fd> */
                                        report_stats_fd = strtou32_or_err(argv[i+1], _("invalid argument -r"));
                                        ++i;
                                        goto next_arg;