Added support for ignoring '-g' per GNU ls, thanks to David Vrabel

[oweals/busybox.git] / ln.c

diff --git a/ln.c b/ln.c
index d4fa47306b585164571b731091903b73b29301f0..57e412dc8fe23ac6163183c9f9637300af50ac96 100644 (file)
--- a/ln.c
+++ b/ln.c
@@ -34,12 +34,15 @@
 static const char ln_usage[] =
        "ln [OPTION] TARGET... LINK_NAME|DIRECTORY\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nCreate a link named LINK_NAME or DIRECTORY to the specified TARGET\n\n"
+       "\nCreate a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
+       "\nYou may use '--' to indicate that all following arguments are non-options.\n\n"
        "Options:\n"
        "\t-s\tmake symbolic links instead of hard links\n"
 
        "\t-f\tremove existing destination files\n"
+#if 0
        "\t-n\tno dereference symlinks - treat like normal file\n"
+#endif
 #endif
        ;
 
@@ -51,16 +54,14 @@ extern int ln_main(int argc, char **argv)
 {
        char *linkName;
        int linkIntoDirFlag;
+       int stopIt = FALSE;
 
-       if (argc < 3) {
-               usage(ln_usage);
-       }
        argc--;
        argv++;
 
        /* Parse any options */
-       while (--argc >= 0 && *argv && **argv) {
-               while (**argv == '-') {
+       while (argc > 0 && stopIt == FALSE) {
+               if (**argv == '-') {
                        while (*++(*argv))
                                switch (**argv) {
                                        case 's':
@@ -72,15 +73,21 @@ extern int ln_main(int argc, char **argv)
                                        case 'n':
                                                followLinks = FALSE;
                                                break;
+                                       case '-':
+                                               stopIt = TRUE;
+                                               break;
                                        default:
                                                usage(ln_usage);
                                }
+                       argc--;
+                       argv++;
                }
-               argv++;
+               else
+                       break;
        }
 
-       if (argc < 1) {
-               fatalError("ln: missing file argument\n");
+       if (argc < 2) {
+               usage(ln_usage);
        }
 
        linkName = argv[argc - 1];
@@ -92,20 +99,24 @@ extern int ln_main(int argc, char **argv)
 
        linkIntoDirFlag = isDirectory(linkName, TRUE, NULL);
 
-       if ((argc > 3) && !linkIntoDirFlag) {
+       if ((argc >= 3) && linkIntoDirFlag == FALSE) {
                fprintf(stderr, not_a_directory, "ln", linkName);
                exit FALSE;
        }
 
        while (argc-- >= 2) {
+#if 0
                char srcName[BUFSIZ + 1];
-               int nChars, status;
+               int nChars;
+#endif
+               int status;
 
                if (strlen(*argv) > BUFSIZ) {
                        fprintf(stderr, name_too_long, "ln");
                        exit FALSE;
                }
 
+#if 0
                if (followLinks == FALSE) {
                        strcpy(srcName, *argv);
                } else {
@@ -114,6 +125,7 @@ extern int ln_main(int argc, char **argv)
                        nChars = readlink(*argv, srcName, BUFSIZ);
                        srcName[nChars] = '\0';
                }
+#endif
 
                if (removeoldFlag == TRUE) {
                        status = (unlink(linkName) && errno != ENOENT);
@@ -132,7 +144,7 @@ extern int ln_main(int argc, char **argv)
                        exit FALSE;
                }
        }
-       exit TRUE;
+       return( TRUE);
 }
 
 /*