From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 25 Sep 2000 20:35:54 +0000 (-0000)
Subject: Fix from Matt Kraai for the  to the "busybox --install prints out on STDERR
X-Git-Tag: 0_47~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c5949f62e533a821593337f7698d53eec8674bb1;p=oweals%2Fbusybox.git

Fix from Matt Kraai for the  to the "busybox --install prints out on STDERR
"File already exists" messages for all files (including the ones that DON'T
exist)" problem reported by "Bruno L. F. Cabral" <bruno@openline.com.br>.

Thanks Matt!
 -Erik
---

diff --git a/applets/busybox.c b/applets/busybox.c
index f9237744c..17a4c447a 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -409,33 +409,26 @@ static char *busybox_fullpath()
 }
 
 /* create (sym)links for each applet */
-static int install_links(const char *busybox, int use_symbolic_links)
+static void install_links(const char *busybox, int use_symbolic_links)
 {
 	__link_f Link = link;
 
 	char command[256];
 	int i;
-	int rc = 0;
+	int rc;
 
 	if (use_symbolic_links) Link = symlink;
 
 	for (i = 0; applets[i].name != NULL; i++) {
-		sprintf (
-			command, 
-			"%s/%s", 
-			install_dir[applets[i].location], 
-			applets[i].name
-		);
-#if 1
-		rc |= Link(busybox, command);
-#else
-		puts(command);
-#endif
+		sprintf ( command, "%s/%s", 
+				install_dir[applets[i].location], 
+				applets[i].name);
+		rc = Link(busybox, command);
+
 		if (rc) {
 			errorMsg("%s: %s\n", command, strerror(errno));
 		}
 	}
-	return rc;
 }
 
 #endif /* BB_FEATURE_INSTALLER */
diff --git a/busybox.c b/busybox.c
index f9237744c..17a4c447a 100644
--- a/busybox.c
+++ b/busybox.c
@@ -409,33 +409,26 @@ static char *busybox_fullpath()
 }
 
 /* create (sym)links for each applet */
-static int install_links(const char *busybox, int use_symbolic_links)
+static void install_links(const char *busybox, int use_symbolic_links)
 {
 	__link_f Link = link;
 
 	char command[256];
 	int i;
-	int rc = 0;
+	int rc;
 
 	if (use_symbolic_links) Link = symlink;
 
 	for (i = 0; applets[i].name != NULL; i++) {
-		sprintf (
-			command, 
-			"%s/%s", 
-			install_dir[applets[i].location], 
-			applets[i].name
-		);
-#if 1
-		rc |= Link(busybox, command);
-#else
-		puts(command);
-#endif
+		sprintf ( command, "%s/%s", 
+				install_dir[applets[i].location], 
+				applets[i].name);
+		rc = Link(busybox, command);
+
 		if (rc) {
 			errorMsg("%s: %s\n", command, strerror(errno));
 		}
 	}
-	return rc;
 }
 
 #endif /* BB_FEATURE_INSTALLER */