Skip to contentSkip to conversation

fsck: Fix parsing of -r

PATCH Applied Stanislav Brabec 2 participants 2 messages Apr 29, 2015 – May 5, 2015 Util-Linux package

lore
Share & tools
lore

Stanislav Brabec

author
#0 lore raw

PATCH 1/1 fsck: Fix parsing of -r

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 <[email protected]>
---
 disk-utils/fsck.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
disk-utils/fsck.c +1 -1
index bd2bf36..465e6d3 100644
@@ -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;
Signature · 13 lines
2.3.5

-- 
Best Regards / S pozdravem,

Stanislav Brabec
software developer
---------------------------------------------------------------------
SUSE LINUX, s. r. o.                          e-mail: [email protected]
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
maintainer Applied
#1 lore raw
Quoted 2 lines · Stanislav Brabec
 disk-utils/fsck.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Signature · 2 lines
 Karel Zak  <[email protected]>
 http://karelzak.blogspot.com