Fixed a bunch of stuff:

	* Fixed segfault caused by "touch -c"
	* 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>"
updated docs accordingly.
 -Erik

2 files changed, 42 insertions, 32 deletions

diff --git a/coreutils/ln.c b/coreutils/ln.c
index 29ff93863..d4fa47306 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -59,25 +59,30 @@ extern int ln_main(int argc, char **argv)
 	argv++;
 
 	/* Parse any options */
-	while (**argv == '-') {
-		while (*++(*argv))
-			switch (**argv) {
-			case 's':
-				symlinkFlag = TRUE;
-				break;
-			case 'f':
-				removeoldFlag = TRUE;
-				break;
-			case 'n':
-				followLinks = FALSE;
-				break;
-			default:
-				usage(ln_usage);
-			}
-		argc--;
+	while (--argc >= 0 && *argv && **argv) {
+		while (**argv == '-') {
+			while (*++(*argv))
+				switch (**argv) {
+					case 's':
+						symlinkFlag = TRUE;
+						break;
+					case 'f':
+						removeoldFlag = TRUE;
+						break;
+					case 'n':
+						followLinks = FALSE;
+						break;
+					default:
+						usage(ln_usage);
+				}
+		}
 		argv++;
 	}
 
+	if (argc < 1) {
+		fatalError("ln: missing file argument\n");
+	}
+
 	linkName = argv[argc - 1];
 
 	if (strlen(linkName) > BUFSIZ) {
diff --git a/coreutils/rm.c b/coreutils/rm.c
index c62d68aba..5901c5da9 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -31,7 +31,8 @@
 
 static const char *rm_usage = "rm [OPTION]... FILE...\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRemove (unlink) the FILE(s).\n\n"
+	"\nRemove (unlink) the FILE(s).  You may use '--' to\n"
+	"indicate that all following arguments are non-options.\n\n"
 	"Options:\n"
 	"\t-f\t\tremove existing destinations, never prompt\n"
 	"\t-r or -R\tremove the contents of directories recursively\n"
@@ -64,29 +65,33 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 
 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 (**argv == '-') {
-		while (*++(*argv))
-			switch (**argv) {
-			case 'R':
-			case 'r':
-				recursiveFlag = TRUE;
-				break;
-			case 'f':
-				forceFlag = TRUE;
-				break;
-			default:
-				usage(rm_usage);
-			}
-		argc--;
+	while (--argc >= 0 && *argv && **argv && stopIt==FALSE) {
+		while (**argv == '-') {
+			while (*++(*argv))
+				switch (**argv) {
+					case 'R':
+					case 'r':
+						recursiveFlag = TRUE;
+						break;
+					case 'f':
+						forceFlag = TRUE;
+						break;
+					case '-':
+						stopIt = TRUE;
+						break;
+					default:
+						usage(rm_usage);
+				}
+		}
 		argv++;
 	}