Patch from Matt Kraai <kraai@alumni.carnegiemellon.edu> to

[oweals/busybox.git] / ln.c

diff --git a/ln.c b/ln.c
index 62496fba09b84b779784647112e9892683fafdc5..57e412dc8fe23ac6163183c9f9637300af50ac96 100644 (file)
--- a/ln.c
+++ b/ln.c
@@ -1,8 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini ln implementation for busybox
  *
- *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,74 +22,135 @@
  */
 
 #include "internal.h"
+#define BB_DECLARE_EXTERN
+#define bb_need_name_too_long
+#define bb_need_not_a_directory
+#include "messages.c"
+
 #include <stdio.h>
 #include <dirent.h>
 #include <errno.h>
 
+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"
+       "\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"
 
-static const char ln_usage[] = "ln [OPTION] TARGET... LINK_NAME|DIRECTORY\n"
-"Create a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
-"\nOptions:\n"
-"\t-s\tmake symbolic links instead of hard links\n"
-"\t-f\tremove existing destination files\n";
-
+       "\t-f\tremove existing destination files\n"
+#if 0
+       "\t-n\tno dereference symlinks - treat like normal file\n"
+#endif
+#endif
+       ;
 
 static int symlinkFlag = FALSE;
 static int removeoldFlag = FALSE;
-
+static int followLinks = TRUE;
 
 extern int ln_main(int argc, char **argv)
 {
-    int status;
-    static char* linkName;
-
-    if (argc < 3) {
-       usage (ln_usage);
-    }
-    argc--;
-    argv++;
-
-    /* Parse any options */
-    while (**argv == '-') {
-       while (*++(*argv))
-           switch (**argv) {
-           case 's':
-               symlinkFlag = TRUE;
-               break;
-           case 'f':
-               removeoldFlag = TRUE;
-               break;
-           default:
-               usage (ln_usage);
-           }
+       char *linkName;
+       int linkIntoDirFlag;
+       int stopIt = FALSE;
+
        argc--;
        argv++;
-    }
 
+       /* Parse any options */
+       while (argc > 0 && stopIt == FALSE) {
+               if (**argv == '-') {
+                       while (*++(*argv))
+                               switch (**argv) {
+                                       case 's':
+                                               symlinkFlag = TRUE;
+                                               break;
+                                       case 'f':
+                                               removeoldFlag = TRUE;
+                                               break;
+                                       case 'n':
+                                               followLinks = FALSE;
+                                               break;
+                                       case '-':
+                                               stopIt = TRUE;
+                                               break;
+                                       default:
+                                               usage(ln_usage);
+                               }
+                       argc--;
+                       argv++;
+               }
+               else
+                       break;
+       }
 
-    linkName = argv[argc - 1];
+       if (argc < 2) {
+               usage(ln_usage);
+       }
 
-    if ((argc > 3) && !(isDirectory(linkName))) {
-       fprintf(stderr, "%s: not a directory\n", linkName);
-       exit (FALSE);
-    }
+       linkName = argv[argc - 1];
 
-    while (argc-- >= 2) {
-       if (removeoldFlag==TRUE ) {
-           status = ( unlink(linkName) && errno != ENOENT );
-           if ( status != 0 ) {
-               perror(linkName);
-               exit( FALSE);
-           }
+       if (strlen(linkName) > BUFSIZ) {
+               fprintf(stderr, name_too_long, "ln");
+               exit FALSE;
        }
-       if ( symlinkFlag==TRUE)
-               status = symlink(*argv, linkName);
-       else
-               status = link(*argv, linkName);
-       if ( status != 0 ) {
-           perror(linkName);
-           exit( FALSE);
+
+       linkIntoDirFlag = isDirectory(linkName, TRUE, NULL);
+
+       if ((argc >= 3) && linkIntoDirFlag == FALSE) {
+               fprintf(stderr, not_a_directory, "ln", linkName);
+               exit FALSE;
        }
-    }
-    exit( TRUE);
+
+       while (argc-- >= 2) {
+#if 0
+               char srcName[BUFSIZ + 1];
+               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 {
+                       /* Warning!  This can silently truncate if > BUFSIZ, but
+                          I don't think that there can be one > BUFSIZ anyway. */
+                       nChars = readlink(*argv, srcName, BUFSIZ);
+                       srcName[nChars] = '\0';
+               }
+#endif
+
+               if (removeoldFlag == TRUE) {
+                       status = (unlink(linkName) && errno != ENOENT);
+                       if (status != 0) {
+                               perror(linkName);
+                               exit FALSE;
+                       }
+               }
+
+               if (symlinkFlag == TRUE)
+                       status = symlink(*argv, linkName);
+               else
+                       status = link(*argv, linkName);
+               if (status != 0) {
+                       perror(linkName);
+                       exit FALSE;
+               }
+       }
+       return( TRUE);
 }
+
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/