procd: Add %m to several functions that return errno.

[project/procd.git] / rcS.c

diff --git a/rcS.c b/rcS.c
index 0dc0aa2..dd3b76d 100644 (file)
--- a/rcS.c
+++ b/rcS.c
@@ -24,6 +24,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <glob.h>
 
 #include <libubox/ustream.h>
@@ -71,7 +72,7 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 
        DEBUG(2, "start %s %s \n", s->file, s->param);
        if (pipe(pipefd) == -1) {
-               ERROR("Failed to create pipe\n");
+               ERROR("Failed to create pipe: %m\n");
                return;
        }
 
@@ -81,6 +82,7 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 
        if (pid) {
                close(pipefd[1]);
+               fcntl(pipefd[0], F_SETFD, FD_CLOEXEC);
                s->fd.stream.string_data = true,
                s->fd.stream.notify_read = pipe_cb,
                runqueue_process_add(q, &s->proc, pid);
@@ -88,9 +90,15 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
                return;
        }
        close(pipefd[0]);
+
+       int devnull = open("/dev/null", O_RDONLY);
+       dup2(devnull, STDIN_FILENO);
        dup2(pipefd[1], STDOUT_FILENO);
        dup2(pipefd[1], STDERR_FILENO);
 
+       if (devnull > STDERR_FILENO)
+               close(devnull);
+
        execlp(s->file, s->file, s->param, NULL);
        exit(1);
 }