more bugs fixed -- found doing regression testing

[oweals/busybox.git] / ln.c

diff --git a/ln.c b/ln.c
index 1e30e2b2914b8f7321bb683456354fcf552e2293..e69cb024a03cb1ab6fbb368b018c335b2dbd3483 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
@@ -21,80 +21,98 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
+#define BB_DECLARE_EXTERN
+#define bb_need_not_a_directory
+#include "messages.c"
+
 #include <stdio.h>
 #include <dirent.h>
 #include <errno.h>
 
+static const int LN_SYMLINK = 1;
+static const int LN_FORCE = 2;
+static const int LN_NODEREFERENCE = 4;
 
-static const char ln_usage[] = "ln [-s] [-f] original-name additional-name\n"
-"\n"
-"\tAdd a new name that refers to the same file as \"original-name\"\n"
-"\n"
-"\t-s:\tUse a \"symbolic\" link, instead of a \"hard\" link.\n"
-"\t-f:\tRemove existing destination files.\n";
-
-
-static int symlinkFlag = FALSE;
-static int removeoldFlag = FALSE;
-static const char *destName;
-
-
-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)
 {
-    int status;
-    char newdestName[NAME_MAX];
+       int status;
+       int srcIsDir;
+       char *srcName;
 
-    if (argc < 3) {
-       usage (ln_usage);
-    }
-    argc--;
-    argv++;
+       if (link_DestName==NULL)
+               return(FALSE);
 
-    /* Parse any options */
-    while (**argv == '-') {
-       while (*++(*argv))
-           switch (**argv) {
-           case 's':
-               symlinkFlag = TRUE;
-               break;
-           case 'f':
-               removeoldFlag = TRUE;
-               break;
-           default:
-               usage (ln_usage);
-           }
-       argc--;
-       argv++;
-    }
+       srcName = (char *) malloc(strlen(link_SrcName)+strlen(link_DestName)+1);
 
+       if (link_SrcName==NULL)
+               strcpy(srcName, link_DestName);
+       else
+               strcpy(srcName, link_SrcName);
 
-    destName = argv[argc - 1];
+       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 ((argc > 3) && !(isDirectory(destName))) {
-       fprintf(stderr, "%s: not a directory\n", destName);
-       exit (FALSE);
-    }
+       if (status != 0) {
+               perror(srcName);
+               return(FALSE);
+       }
+       return(TRUE);
+}
 
-    while (argc-- >= 2) {
-       strcpy(newdestName, destName);
-       strcat(newdestName, (*argv)+(strlen(*(++argv))));
+extern int ln_main(int argc, char **argv)
+{
+       int status = EXIT_SUCCESS;
+       int flag = 0;
+       int opt;
        
-       if (removeoldFlag==TRUE ) {
-           status = ( unlink(newdestName) && errno != ENOENT );
-           if ( status != 0 ) {
-               perror(newdestName);
-               exit( FALSE);
-           }
+       /* Parse any options */
+       while ((opt=getopt(argc, argv, "sfn")) != -1) {
+               switch(opt) {
+                       case 's':
+                               flag |= LN_SYMLINK;
+                               break;
+                       case 'f':
+                               flag |= LN_FORCE;
+                               break;
+                       case 'n':
+                               flag |= LN_NODEREFERENCE;
+                               break;
+                       default:
+                               usage(ln_usage);
+               }
        }
-       if ( symlinkFlag==TRUE)
-               status = symlink(*argv, newdestName);
-       else
-               status = link(*argv, newdestName);
-       if ( status != 0 ) {
-           perror(newdestName);
-           exit( FALSE);
+       while(optind<(argc-1)) {
+               if (fs_link(argv[optind], argv[argc-1], flag)==FALSE)
+                       status = EXIT_FAILURE;
+               optind++;
        }
-    }
-    exit( TRUE);
+       return(status);
 }
+
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/