From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 3 Jan 2015 13:58:15 +0100
Subject: patch to Vanilla Tomato 1.28

---
 release/src/router/busybox/coreutils/ln.c | 100 ++++++++++++++++--------------
 1 file changed, 52 insertions(+), 48 deletions(-)

(limited to 'release/src/router/busybox/coreutils/ln.c')

diff --git a/release/src/router/busybox/coreutils/ln.c b/release/src/router/busybox/coreutils/ln.c
index 5217634f..eb717195 100644
--- a/release/src/router/busybox/coreutils/ln.c
+++ b/release/src/router/busybox/coreutils/ln.c
@@ -2,51 +2,39 @@
 /*
  * Mini ln implementation for busybox
  *
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 compliant */
-/* BB_AUDIT GNU options missing: -b, -d, -F, -i, -S, and -v. */
+/* BB_AUDIT GNU options missing: -d, -F, -i, and -v. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */
 
-/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
- *
- * Fixed bug involving -n option.  Essentially, -n was always in effect.
- */
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
 
 #define LN_SYMLINK          1
 #define LN_FORCE            2
 #define LN_NODEREFERENCE    4
+#define LN_BACKUP           8
+#define LN_SUFFIX           16
 
-extern int ln_main(int argc, char **argv)
+int ln_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ln_main(int argc, char **argv)
 {
 	int status = EXIT_SUCCESS;
 	int flag;
 	char *last;
 	char *src_name;
-	const char *src;
+	char *src;
+	char *suffix = (char*)"~";
+	struct stat statbuf;
 	int (*link_func)(const char *, const char *);
 
-	flag = bb_getopt_ulflags(argc, argv, "sfn");
+	flag = getopt32(argv, "sfnbS:", &suffix);
 
 	if (argc == optind) {
 		bb_show_usage();
@@ -57,23 +45,49 @@ extern int ln_main(int argc, char **argv)
 
 	if (argc == optind + 1) {
 		*--argv = last;
-		last = bb_get_last_path_component(bb_xstrdup(last));
+		last = bb_get_last_path_component_strip(xstrdup(last));
 	}
 
 	do {
-		src_name = 0;
+		src_name = NULL;
 		src = last;
 
 		if (is_directory(src,
-						 (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
-						 NULL)) {
-			src_name = bb_xstrdup(*argv);
-			src = concat_path_file(src, bb_get_last_path_component(src_name));
+		                (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
+		                NULL)
+		) {
+			src_name = xstrdup(*argv);
+			src = concat_path_file(src, bb_get_last_path_component_strip(src_name));
 			free(src_name);
-			src_name = (char *)src;
+			src_name = src;
+		}
+		if (!(flag & LN_SYMLINK) && stat(*argv, &statbuf)) {
+			// coreutils: "ln dangling_symlink new_hardlink" works
+			if (lstat(*argv, &statbuf) || !S_ISLNK(statbuf.st_mode)) {
+				bb_simple_perror_msg(*argv);
+				status = EXIT_FAILURE;
+				free(src_name);
+				continue;
+			}
 		}
 
-		if (flag & LN_FORCE) {
+		if (flag & LN_BACKUP) {
+			char *backup;
+			backup = xasprintf("%s%s", src, suffix);
+			if (rename(src, backup) < 0 && errno != ENOENT) {
+				bb_simple_perror_msg(src);
+				status = EXIT_FAILURE;
+				free(backup);
+				continue;
+			}
+			free(backup);
+			/*
+			 * When the source and dest are both hard links to the same
+			 * inode, a rename may succeed even though nothing happened.
+			 * Therefore, always unlink().
+			 */
+			unlink(src);
+		} else if (flag & LN_FORCE) {
 			unlink(src);
 		}
 
@@ -81,25 +95,15 @@ extern int ln_main(int argc, char **argv)
 		if (flag & LN_SYMLINK) {
 			link_func = symlink;
 		}
-		
+
 		if (link_func(*argv, src) != 0) {
-			bb_perror_msg(src);
-			status = EXIT_FAILURE;;
+			bb_simple_perror_msg(src);
+			status = EXIT_FAILURE;
 		}
 
 		free(src_name);
-		
+
 	} while ((++argv)[1]);
 
 	return status;
 }
-
-
-
-
-
-
-
-
-
-
-- 
cgit v1.2.3-54-g00ecf