netifd: fix process stdin/stdout/stderr when the pipe fds overlap with standard fds

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 7630a8f..d8cb17f 100644 (file)
--- 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,7 +110,9 @@ 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);
 }
@@ -144,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);
@@ -153,12 +154,17 @@ 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);
-
                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);
@@ -193,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);
 }