upgraded: register stage2 process in uloop as intended

[project/procd.git] / rcS.c

diff --git a/rcS.c b/rcS.c
index 039b595..4ecf0c1 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>
@@ -42,7 +43,7 @@ struct initd {
 
 static void pipe_cb(struct ustream *s, int bytes)
 {
-       struct ustream_buf *buf = s->r.head;
+       struct initd *initd = container_of(s, struct initd, fd.stream);
        char *newline, *str;
        int len;
 
@@ -50,12 +51,15 @@ static void pipe_cb(struct ustream *s, int bytes)
                str = ustream_get_read_buf(s, NULL);
                if (!str)
                        break;
-               newline = strchr(buf->data, '\n');
+               newline = strchr(str, '\n');
                if (!newline)
                        break;
                *newline = 0;
                len = newline + 1 - str;
-               syslog(0, buf->data);
+               ULOG_NOTE("%s: %s", initd->file, str);
+#ifdef SHOW_BOOT_ON_CONSOLE
+               fprintf(stderr, "%s: %s\n", initd->file, str);
+#endif
                ustream_consume(s, len);
        } while (1);
 }
@@ -85,9 +89,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);
 }
@@ -113,9 +123,16 @@ static void add_initd(struct runqueue *q, char *file, char *param)
        char *p, *f;
 
        s = calloc_a(sizeof(*s), &f, strlen(file) + 1, &p, strlen(param) + 1);
+       if (!s) {
+               ERROR("Out of memory in %s.\n", file);
+               return;
+       }
        s->proc.task.type = &initd_type;
        s->proc.task.complete = q_initd_complete;
-       s->proc.task.run_timeout = 15000;
+       if (!strcmp(param, "stop") || !strcmp(param, "shutdown")) {
+               s->proc.task.run_timeout = 15000;
+               s->proc.task.cancel_timeout = 10000;
+       }
        s->param = p;
        s->file = f;
        strcpy(s->param, param);
@@ -129,6 +146,11 @@ static int _rc(struct runqueue *q, char *path, const char *file, char *pattern,
        glob_t gl;
        int j;
 
+       if (!dir) {
+               ERROR("Out of memory in %s.\n", file);
+               return -1;
+       }
+
        DEBUG(2, "running %s/%s%s %s\n", path, file, pattern, param);
        sprintf(dir, "%s/%s%s", path, file, pattern);
        if (glob(dir, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl)) {