Merge branch 'maint' into next

2016-08-10 18:53:14 -04:00 · 2016-08-10 18:53:14 -04:00 · 9a23fa8334
parent 4ccf9e4fe1 713edbd082
commit 9a23fa8334
1 changed files with 2 additions and 2 deletions
--- a/misc/fsck.c
+++ b/misc/fsck.c
@ -1174,8 +1174,8 @@ static void PRS(int argc, char *argv[])
 						progress_fd = 0;
 					else
 						goto next_arg;
-				} else if ((i+1) < argc &&
-					   !strncmp(argv[i+1], "-", 1) == 0) {
+				} else if (argc > i + 1 &&
+					   argv[i + 1][0] != '-') {
 					progress_fd = string_to_int(argv[i]);
 					if (progress_fd < 0)
 						progress_fd = 0;