X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fvfork_daemon_rexec.c;h=26d1826e015518b0e750ccb8d8a389accd5b39b6;hb=9af7c9d6b62ceb07a9ba24cee0cf4a08c689235e;hp=ffd9dc15e933376bc116667303f883d049874ed2;hpb=0a8812bdc588fd6e32f7c5ad97cfc9288b9822dc;p=oweals%2Fbusybox.git

diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index ffd9dc15e..26d1826e0 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -15,14 +15,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
 #include <paths.h>
 #include "libbb.h"
 
-
-#if defined(__uClinux__)
+#ifdef BB_NOMMU
 void vfork_daemon_rexec(int nochdir, int noclose,
 		int argc, char **argv, char *foreground_opt)
 {
@@ -33,21 +29,21 @@ void vfork_daemon_rexec(int nochdir, int noclose,
 	setsid();
 
 	if (!nochdir)
-		chdir("/");
+		xchdir("/");
 
 	if (!noclose && (fd = open(bb_dev_null, O_RDWR, 0)) != -1) {
 		dup2(fd, STDIN_FILENO);
 		dup2(fd, STDOUT_FILENO);
 		dup2(fd, STDERR_FILENO);
-		if (fd > 2)
-			close(fd);
+		while (fd > 2)
+			close(fd--);
 	}
 
-	vfork_args = xcalloc(sizeof(char *), argc + 3);
-	vfork_args[a++] = "/bin/busybox";
-	while(*argv) {
-	    vfork_args[a++] = *argv;
-	    argv++;
+	vfork_args = xzalloc(sizeof(char *) * (argc + 3));
+	vfork_args[a++] = CONFIG_BUSYBOX_EXEC_PATH;
+	while (*argv) {
+		vfork_args[a++] = *argv;
+		argv++;
 	}
 	vfork_args[a] = foreground_opt;
 	switch (vfork()) {
@@ -64,4 +60,4 @@ void vfork_daemon_rexec(int nochdir, int noclose,
 		exit(0);
 	}
 }
-#endif /* uClinux */
+#endif /* BB_NOMMU */