X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ln.c;h=6d41cce62c67dd07602379ebaf7f697d971b2997;hb=f957c779104d187a035b48d1fb9ce9acb7351001;hp=8b8fa1c5887eadc9a5bf00c433f33c05e2098ddb;hpb=bf181b9338152759fd56c8009e9a962a84808e7c;p=oweals%2Fbusybox.git

diff --git a/ln.c b/ln.c
index 8b8fa1c58..6d41cce62 100644
--- a/ln.c
+++ b/ln.c
@@ -2,7 +2,7 @@
 /*
  * Mini ln implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 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,105 +21,108 @@
  *
  */
 
-#include "internal.h"
+#include <stdio.h>
+#include <dirent.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.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 int symlinkFlag = FALSE;
-static int removeoldFlag = FALSE;
-static int followLinks = TRUE;
+static const int LN_SYMLINK = 1;
+static const int LN_FORCE = 2;
+static const int LN_NODEREFERENCE = 4;
 
-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, *dirName=NULL;
-	int linkIntoDirFlag;
-	int stopIt = FALSE;
-
-	argc--;
-	argv++;
+	int status;
+	int src_is_dir;
+	char *src_name;
+
+	if (link_destname==NULL)
+		return(FALSE);
+
+	src_name = (char *) xmalloc(strlen(link_srcname)+strlen(link_destname)+1);
+
+	if (link_srcname==NULL)
+		strcpy(src_name, link_destname);
+	else
+		strcpy(src_name, link_srcname);
+
+	if (flag&LN_NODEREFERENCE)
+		src_is_dir = is_directory(src_name, TRUE, NULL);
+	else
+		src_is_dir = is_directory(src_name, FALSE, NULL);	
+	
+	if ((src_is_dir==TRUE)&&((flag&LN_NODEREFERENCE)==0)) {
+		char* srcdir_name;
+
+		srcdir_name = xstrdup(link_destname);
+		strcat(src_name, "/");
+		strcat(src_name, get_last_path_component(srcdir_name));
+		free(srcdir_name);
+	}
+	
+	if (flag&LN_FORCE)
+		unlink(src_name);
+		
+	if (flag&LN_SYMLINK)
+		status = symlink(link_destname, src_name);
+	else
+		status = link(link_destname, src_name);
+
+	if (status != 0) {
+		perror_msg(src_name);
+		return(FALSE);
+	}
+	return(TRUE);
+}
 
+extern int ln_main(int argc, char **argv)
+{
+	int status = EXIT_SUCCESS;
+	int flag = 0;
+	int opt;
+	
 	/* 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++;
+	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();
 		}
-		else
-			break;
 	}
-
-	if (argc < 2) {
-		usage(ln_usage);
-	}
-
-	linkName = argv[argc - 1];
-
-	linkIntoDirFlag = isDirectory(linkName, followLinks, NULL);
-	if ((argc >= 3) && linkIntoDirFlag == FALSE) {
-		errorMsg(not_a_directory, linkName);
-		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;
 	}
-
-	if (linkIntoDirFlag == TRUE)
-		dirName = linkName;
-
-	while (argc-- >= 2) {
-		int status;
-
-		if (linkIntoDirFlag == TRUE) {
-			char *baseName = get_last_path_component(*argv);
-			linkName = (char *)malloc(strlen(dirName)+strlen(baseName)+2);
-			strcpy(linkName, dirName);
-			if(dirName[strlen(dirName)-1] != '/')
-				strcat(linkName, "/");
-			strcat(linkName,baseName);
-		}
-
-		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;
-		}
-
-		if (linkIntoDirFlag == TRUE)
-			free(linkName);
-
-		argv++;
+	while(optind<(argc-1)) {
+		if (fs_link(argv[optind], argv[argc-1], flag)==FALSE)
+			status = EXIT_FAILURE;
+		optind++;
 	}
-	return( TRUE);
+	exit(status);
 }
 
 /*