more bugs fixed -- found doing regression testing

[oweals/busybox.git] / ln.c

diff --git a/ln.c b/ln.c
index 29ff938635df4131c6180b1b130e36a12c4a72b6..e69cb024a03cb1ab6fbb368b018c335b2dbd3483 100644 (file)
--- a/ln.c
+++ b/ln.c
@@ -21,9 +21,8 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
-#define bb_need_name_too_long
 #define bb_need_not_a_directory
 #include "messages.c"
 
@@ -31,103 +30,83 @@
 #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\n"
-       "Options:\n"
-       "\t-s\tmake symbolic links instead of hard links\n"
+static const int LN_SYMLINK = 1;
+static const int LN_FORCE = 2;
+static const int LN_NODEREFERENCE = 4;
 
-       "\t-f\tremove existing destination files\n"
-       "\t-n\tno dereference symlinks - treat like normal file\n"
-#endif
-       ;
-
-static int symlinkFlag = FALSE;
-static int removeoldFlag = FALSE;
-static int followLinks = TRUE;
-
-extern int ln_main(int argc, char **argv)
+/*
+ * linkDestName is where the link points to,
+ * linkSrcName is the name of the link to be created.
+ */
+static int fs_link(const char *link_DestName, const char *link_SrcName, const int flag)
 {
-       char *linkName;
-       int linkIntoDirFlag;
-
-       if (argc < 3) {
-               usage(ln_usage);
+       int status;
+       int srcIsDir;
+       char *srcName;
+
+       if (link_DestName==NULL)
+               return(FALSE);
+
+       srcName = (char *) malloc(strlen(link_SrcName)+strlen(link_DestName)+1);
+
+       if (link_SrcName==NULL)
+               strcpy(srcName, link_DestName);
+       else
+               strcpy(srcName, link_SrcName);
+
+       if (flag&LN_NODEREFERENCE)
+               srcIsDir = is_directory(srcName, TRUE, NULL);
+       else
+               srcIsDir = is_directory(srcName, FALSE, NULL);  
+       
+       if ((srcIsDir==TRUE)&&((flag&LN_NODEREFERENCE)==0)) {
+               strcat(srcName, "/");
+               strcat(srcName, link_DestName);
+       }
+       
+       if (flag&LN_FORCE)
+               unlink(srcName);
+               
+       if (flag&LN_SYMLINK)
+               status = symlink(link_DestName, srcName);
+       else
+               status = link(link_DestName, srcName);
+
+       if (status != 0) {
+               perror(srcName);
+               return(FALSE);
        }
-       argc--;
-       argv++;
+       return(TRUE);
+}
 
+extern int ln_main(int argc, char **argv)
+{
+       int status = EXIT_SUCCESS;
+       int flag = 0;
+       int opt;
+       
        /* Parse any options */
-       while (**argv == '-') {
-               while (*++(*argv))
-                       switch (**argv) {
+       while ((opt=getopt(argc, argv, "sfn")) != -1) {
+               switch(opt) {
                        case 's':
-                               symlinkFlag = TRUE;
+                               flag |= LN_SYMLINK;
                                break;
                        case 'f':
-                               removeoldFlag = TRUE;
+                               flag |= LN_FORCE;
                                break;
                        case 'n':
-                               followLinks = FALSE;
+                               flag |= LN_NODEREFERENCE;
                                break;
                        default:
                                usage(ln_usage);
-                       }
-               argc--;
-               argv++;
-       }
-
-       linkName = argv[argc - 1];
-
-       if (strlen(linkName) > BUFSIZ) {
-               fprintf(stderr, name_too_long, "ln");
-               exit FALSE;
-       }
-
-       linkIntoDirFlag = isDirectory(linkName, TRUE, NULL);
-
-       if ((argc > 3) && !linkIntoDirFlag) {
-               fprintf(stderr, not_a_directory, "ln", linkName);
-               exit FALSE;
-       }
-
-       while (argc-- >= 2) {
-               char srcName[BUFSIZ + 1];
-               int nChars, status;
-
-               if (strlen(*argv) > BUFSIZ) {
-                       fprintf(stderr, name_too_long, "ln");
-                       exit FALSE;
-               }
-
-               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';
-               }
-
-               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;
                }
        }
-       exit TRUE;
+       while(optind<(argc-1)) {
+               if (fs_link(argv[optind], argv[argc-1], flag)==FALSE)
+                       status = EXIT_FAILURE;
+               optind++;
+       }
+       return(status);
 }
 
 /*