X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=43ec24fde9f48f7394ec218f0abde82688e5eb9a;hp=5bfd87aacf5fd29e76d33a016d333c1c82b258ae;hb=9bf007985b20cb65147d8fd8ff59a6eb65ed22b8;hpb=363eee36e3a190fe77f5d7880d9ce637f0619507

diff --git a/main.c b/main.c
index 5bfd87a..43ec24f 100644
--- a/main.c
+++ b/main.c
@@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
-#include <unistd.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <syslog.h>
@@ -54,8 +53,6 @@ static bool use_syslog = true;
 static void
 netifd_delete_process(struct netifd_process *proc)
 {
-	if (proc->uloop.pending)
-		uloop_process_delete(&proc->uloop);
 	list_del(&proc->list);
 	ustream_free(&proc->log.stream);
 	close(proc->log.fd.fd);
@@ -85,7 +82,7 @@ netifd_process_log_read_cb(struct ustream *s, int bytes)
 	char *data;
 	int len = 0;
 
-	proc = container_of(s, struct netifd_process, log);
+	proc = container_of(s, struct netifd_process, log.stream);
 	log_prefix = proc->log_prefix;
 	if (!log_prefix)
 		log_prefix = "process";
@@ -113,15 +110,13 @@ netifd_process_log_read_cb(struct ustream *s, int bytes)
 			netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n",
 				log_prefix, proc->uloop.pid, data);
 			proc->log_overflow = true;
-		}
+		} else
+			break;
+
 		ustream_consume(s, len);
 	} while (1);
 }
 
-static void netifd_process_log_state_cb(struct ustream *s)
-{
-}
-
 static void
 netifd_process_cb(struct uloop_process *proc, int ret)
 {
@@ -148,6 +143,8 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
 		goto error;
 
 	if (!pid) {
+		int i;
+
 		if (env) {
 			while (*env) {
 				putenv(*env);
@@ -155,14 +152,19 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
 			}
 		}
 		if (proc->dir_fd >= 0)
-			fchdir(proc->dir_fd);
-
-		dup2(pfds[1], 0);
-		dup2(pfds[1], 1);
-		dup2(pfds[1], 2);
+			if (fchdir(proc->dir_fd)) {}
 
 		close(pfds[0]);
-		close(pfds[1]);
+
+		for (i = 0; i <= 2; i++) {
+			if (pfds[1] == i)
+				continue;
+
+			dup2(pfds[1], i);
+		}
+
+		if (pfds[1] > 2)
+			close(pfds[1]);
 
 		execvp(argv[0], (char **) argv);
 		exit(127);
@@ -180,7 +182,6 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
 	system_fd_set_cloexec(pfds[0]);
 	proc->log.stream.string_data = true;
 	proc->log.stream.notify_read = netifd_process_log_read_cb;
-	proc->log.stream.notify_state = netifd_process_log_state_cb;
 	ustream_fd_init(&proc->log, pfds[0]);
 
 	return 0;
@@ -198,6 +199,7 @@ netifd_kill_process(struct netifd_process *proc)
 		return;
 
 	kill(proc->uloop.pid, SIGKILL);
+	uloop_process_delete(&proc->uloop);
 	netifd_delete_process(proc);
 }