X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=coreutils%2Fln.c;h=427ffcc6ee2d8f7d1447ef4c5021993f35593466;hb=18d8a3b7e314036b915ba9e537832d4a52db75bc;hp=8f7719fa466f5bb79066f36a2ef5c629df0f1441;hpb=b0e9a709ba1ae1724d413a77f5b67b1a3e6c6cb7;p=oweals%2Fbusybox.git

diff --git a/coreutils/ln.c b/coreutils/ln.c
index 8f7719fa4..427ffcc6e 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -1,7 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini ln implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
+ * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,80 +21,113 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <dirent.h>
+#include <string.h>
+#include <stdlib.h>
 #include <errno.h>
+#include <unistd.h>
+#include "busybox.h"
 
 
-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 const int LN_SYMLINK = 1;
+static const int LN_FORCE = 2;
+static const int LN_NODEREFERENCE = 4;
 
-
-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 src_is_dir;
+	char *src_name = 0;
+	const char *src;
 
-    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++;
-    }
+	if (link_srcname==NULL)
+		src = link_destname;
+	else
+		src = link_srcname;
 
+	if (flag&LN_NODEREFERENCE)
+		src_is_dir = is_directory(src, TRUE, NULL);
+	else
+		src_is_dir = is_directory(src, FALSE, NULL);
+	
+	if ((src_is_dir==TRUE)&&((flag&LN_NODEREFERENCE)==0)) {
+		char* srcdir_name;
 
-    destName = argv[argc - 1];
+		srcdir_name = xstrdup(link_destname);
+		src_name = concat_path_file(src, get_last_path_component(srcdir_name));
+		src = src_name;
+		free(srcdir_name);
+	}
+	
+	if (flag&LN_FORCE)
+		unlink(src);
+		
+	if (flag&LN_SYMLINK)
+		status = symlink(link_destname, src);
+	else
+		status = link(link_destname, src);
 
-    if ((argc > 3) && !(isDirectory(destName))) {
-	fprintf(stderr, "%s: not a directory\n", destName);
-	exit (FALSE);
-    }
+	if (status != 0) {
+		perror_msg(src);
+		status = FALSE;
+	} else {
+		status = TRUE;
+	}
+	free(src_name);
+	return status;
+}
 
-    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:
+				show_usage();
+		}
 	}
-	if ( symlinkFlag==TRUE)
-		status = symlink(*argv, newdestName);
-	else
-		status = link(*argv, newdestName);
-	if ( status != 0 ) {
-	    perror(newdestName);
-	    exit( FALSE);
+	if (optind > (argc-1)) {
+		show_usage();
+	} 
+	if (optind == (argc-1)) {
+		if (fs_link(argv[optind], 
+					get_last_path_component(argv[optind]), flag)==FALSE)
+			status = EXIT_FAILURE;
+	}
+	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:
+*/