Fixed "rm foo" that had been broken while implementing "rm -- foo"

1 files changed, 11 insertions, 6 deletions

diff --git a/rm.c b/rm.c
index 5901c5da9..b1cda3aed 100644
--- a/rm.c
+++ b/rm.c
@@ -68,14 +68,12 @@ extern int rm_main(int argc, char **argv)
 	int stopIt=FALSE;
 	struct stat statbuf;
 
-	if (argc < 2) {
-		usage(rm_usage);
-	}
+	argc--;
 	argv++;
 
 	/* Parse any options */
-	while (--argc >= 0 && *argv && **argv && stopIt==FALSE) {
-		while (**argv == '-') {
+	while (argc > 0 && stopIt == FALSE) {
+		if (**argv == '-') {
 			while (*++(*argv))
 				switch (**argv) {
 					case 'R':
@@ -91,8 +89,15 @@ extern int rm_main(int argc, char **argv)
 					default:
 						usage(rm_usage);
 				}
+			argc--;
+			argv++;
 		}
-		argv++;
+		else
+			break;
+	}
+
+	if (argc < 1 && forceFlag == FALSE) {
+		usage(rm_usage);
 	}
 
 	while (argc-- > 0) {