Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / ln.c

diff --git a/ln.c b/ln.c
index d4fa47306b585164571b731091903b73b29301f0..2233a1d68d032d318d13cd6e43ae745e34526d2b 100644 (file)
--- a/ln.c
+++ b/ln.c
@@ -51,16 +51,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 +70,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,7 +96,7 @@ 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;
        }
@@ -132,7 +136,7 @@ extern int ln_main(int argc, char **argv)
                        exit FALSE;
                }
        }
-       exit TRUE;
+       return( TRUE);
 }
 
 /*