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

diff --git a/Changelog b/Changelog
index 57b936e7cc8f0d62b78bf63647fc29267c056882..637f983e9a8d67b47e5d07ef2d201222f628bd12 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -50,6 +50,11 @@
        * Fixed all fatalError() calls lacking a "\n", thanks to Pavel Roskin.
        * Fixed a segfault in yes when no args were given -- Pavel Roskin.
        * Simplified freeramdisk and added argument checking -- Pavel Roskin. 
+       * 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>"
        * "which" rewritten to use stat(). Fixes to improve its compatability
            with traditional implementations -- Pavel Roskin.
        * More doc updates

diff --git a/Makefile b/Makefile
index 386d8c32839e342476c0f525a7944c24ccd092ab..1395b5262739b82a0c940aa70dceb3dc91c7cbb3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ export VERSION
 # Set the following to `true' to make a debuggable build.
 # Leave this set to `false' for production use.
 # eg: `make DODEBUG=true tests'
-DODEBUG = false
+DODEBUG = true
 
 # If you want a static binary, turn this on.
 DOSTATIC = false

diff --git a/TODO b/TODO
index 4778436d4e93cb6d16a6adeb99a87c8367b93240..70706dc113f3c11f7cc1f4c117b3cdb9659f96ef 100644 (file)
--- a/TODO
+++ b/TODO
@@ -26,12 +26,6 @@ Bugs that need fixing before the 0.44 release goes out the door:
        chmod -R
        chown -R
        chgrp -R
-       cp -a -a
-       ln -s -s
-       rm -f
-       rm -f -
-       rm -- -
-       touch -c
   - I believe that swaponoff may also be also broken (check it).
   - It used to be that BusyBox tar would happily overwrite existing files on
       an extraction.  However, as of 0.42, BusyBox tar simply dies as soon as an 

diff --git a/coreutils/ln.c b/coreutils/ln.c
index 29ff938635df4131c6180b1b130e36a12c4a72b6..d4fa47306b585164571b731091903b73b29301f0 100644 (file)
--- 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 c62d68abad0f53a102544b95cbe828fa9172dc37..5901c5da9b631ff37d25be79f87c6ce4ebaee825 100644 (file)
--- 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++;
        }
 

diff --git a/cp_mv.c b/cp_mv.c
index ac1e71b823cac1beffa3440eee18a3e19cf4db4b..4445e7747df525b26e0d256661e2734b77e19685 100644 (file)
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -203,37 +203,42 @@ extern int cp_mv_main(int argc, char **argv)
        if (dz_i == is_cp) {
                recursiveFlag = preserveFlag = forceFlag = FALSE;
                followLinks = TRUE;
-               while (**argv == '-') {
-                       while (*++(*argv)) {
-                               switch (**argv) {
-                               case 'a':
-                                       followLinks = FALSE;
-                                       preserveFlag = TRUE;
-                                       recursiveFlag = TRUE;
-                                       break;
-                               case 'd':
-                                       followLinks = FALSE;
-                                       break;
-                               case 'p':
-                                       preserveFlag = TRUE;
-                                       break;
-                               case 'R':
-                                       recursiveFlag = TRUE;
-                                       break;
-                               case 'f':
-                                       forceFlag = TRUE;
-                                       break;
-                               default:
-                                       usage(cp_mv_usage[is_cp]);
+               while (--argc >= 0 && *argv && **argv) {
+                       while (**argv == '-') {
+                               while (*++(*argv)) {
+                                       switch (**argv) {
+                                       case 'a':
+                                               followLinks = FALSE;
+                                               preserveFlag = TRUE;
+                                               recursiveFlag = TRUE;
+                                               break;
+                                       case 'd':
+                                               followLinks = FALSE;
+                                               break;
+                                       case 'p':
+                                               preserveFlag = TRUE;
+                                               break;
+                                       case 'R':
+                                               recursiveFlag = TRUE;
+                                               break;
+                                       case 'f':
+                                               forceFlag = TRUE;
+                                               break;
+                                       default:
+                                               usage(cp_mv_usage[is_cp]);
+                                       }
                                }
                        }
-                       argc--;
                        argv++;
                }
+               if (argc < 1) {
+                       fatalError("cp: missing file argument\n");
+               }
        } else {                                        /* (dz_i == is_mv) */
                recursiveFlag = preserveFlag = TRUE;
                followLinks = FALSE;
        }
+       
 
        if (strlen(argv[argc - 1]) > BUFSIZ) {
                fprintf(stderr, name_too_long, "cp");

diff --git a/docs/busybox.pod b/docs/busybox.pod
index 272885164791e59b9d6bdebffd0bb3ba759df8f2..7b76e7e79442b2f1dc3b950c7e39fa42b54eac5f 100644 (file)
--- a/docs/busybox.pod
+++ b/docs/busybox.pod
@@ -1327,7 +1327,8 @@ Instructs the kernel to reboot the system.
 
 Usage: rm [OPTION]... FILE...
 
-Remove (unlink) the FILE(s).
+Remove (unlink) the FILE(s).  You may use '--' to 
+indicate that all following arguments are non-options.
 
 Options:
 
@@ -1946,4 +1947,4 @@ Enrique Zanardi <ezanardi@ull.es>
 
 =cut
 
-# $Id: busybox.pod,v 1.34 2000/06/05 17:23:06 andersen Exp $
+# $Id: busybox.pod,v 1.35 2000/06/06 16:15:23 andersen Exp $

diff --git a/ln.c b/ln.c
index 29ff938635df4131c6180b1b130e36a12c4a72b6..d4fa47306b585164571b731091903b73b29301f0 100644 (file)
--- a/ln.c
+++ b/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/mkfs_minix.c b/mkfs_minix.c
index c6f057a0787ef6bc9fc48e2b22ea6ec0bafd4c14..ef37c385d5ad5e20984b664f094dd68747ce45f2 100644 (file)
--- a/mkfs_minix.c
+++ b/mkfs_minix.c
@@ -188,7 +188,7 @@ static volatile void show_usage()
        fprintf(stderr,
                        "\t-n [14|30]\tSpecify the maximum length of filenames\n");
        fprintf(stderr,
-                       "\t-i\t\tSpecify the number of inodes for the filesystem\n");
+                       "\t-i INODES\tSpecify the number of inodes for the filesystem\n");
        fprintf(stderr,
                        "\t-l FILENAME\tRead the bad blocks list from FILENAME\n");
        fprintf(stderr, "\t-v\t\tMake a Minix version 2 filesystem\n\n");

diff --git a/rm.c b/rm.c
index c62d68abad0f53a102544b95cbe828fa9172dc37..5901c5da9b631ff37d25be79f87c6ce4ebaee825 100644 (file)
--- a/rm.c
+++ b/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++;
        }
 

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index c6f057a0787ef6bc9fc48e2b22ea6ec0bafd4c14..ef37c385d5ad5e20984b664f094dd68747ce45f2 100644 (file)
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -188,7 +188,7 @@ static volatile void show_usage()
        fprintf(stderr,
                        "\t-n [14|30]\tSpecify the maximum length of filenames\n");
        fprintf(stderr,
-                       "\t-i\t\tSpecify the number of inodes for the filesystem\n");
+                       "\t-i INODES\tSpecify the number of inodes for the filesystem\n");
        fprintf(stderr,
                        "\t-l FILENAME\tRead the bad blocks list from FILENAME\n");
        fprintf(stderr, "\t-v\t\tMake a Minix version 2 filesystem\n\n");