From: Stanislav Brabec <sbrabec@suse.cz>
To: util-linux@vger.kernel.org
Subject: [PATCH] fsck: Fix parsing of -r
Date: Wed, 29 Apr 2015 18:49:47 +0200 [thread overview]
Message-ID: <55410BAB.4030009@suse.cz> (raw)
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index bd2bf36..465e6d3 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -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;
--
2.3.5
--
Best Regards / S pozdravem,
Stanislav Brabec
software developer
---------------------------------------------------------------------
SUSE LINUX, s. r. o. e-mail: sbrabec@suse.cz
Lihovarská 1060/12 tel: +49 911 7405384547
190 00 Praha 9 fax: +420 284 084 001
Czech Republic http://www.suse.cz/
PGP: 830B 40D5 9E05 35D8 5E27 6FA3 717C 209F A04F CD76
next reply other threads:[~2015-04-29 16:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-29 16:49 Stanislav Brabec [this message]
2015-05-05 11:04 ` [PATCH] fsck: Fix parsing of -r Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55410BAB.4030009@suse.cz \
--to=sbrabec@suse.cz \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox