diff options
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | coreutils/rm.c | 17 | ||||
| -rw-r--r-- | rm.c | 17 |
3 files changed, 23 insertions, 13 deletions
@@ -61,7 +61,7 @@ * Fixed segfault caused by "rm -f" * Fixed segfault caused by "ln -s -s" and similar abuses. * Fixed segfault caused by "cp -a -a" and similar abuses. - * Implemented "rm -- <foo>" + * Implemented "rm -- <foo>". Implementation fixed by Pavel Roskin. * "which" rewritten to use stat(). Fixes to improve its compatability with traditional implementations -- Pavel Roskin. * "mount" now reports errors from nfsmount() and assumes NFS mount diff --git a/coreutils/rm.c b/coreutils/rm.c index 5901c5da9..b1cda3aed 100644 --- a/coreutils/rm.c +++ b/coreutils/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) { @@ -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) { |