instance: avoid dumping invalid service instances - prevents a potential crash

[project/procd.git] / rcS.c

diff --git a/rcS.c b/rcS.c
index 039b595..8c72c19 100644 (file)
--- a/rcS.c
+++ b/rcS.c
@@ -42,7 +42,6 @@ struct initd {
 
 static void pipe_cb(struct ustream *s, int bytes)
 {
-       struct ustream_buf *buf = s->r.head;
        char *newline, *str;
        int len;
 
@@ -50,12 +49,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);
+               syslog(0, "%s", str);
+#ifdef SHOW_BOOT_ON_CONSOLE
+               fprintf(stderr, "%s\n", str);
+#endif
                ustream_consume(s, len);
        } while (1);
 }
@@ -115,7 +117,8 @@ static void add_initd(struct runqueue *q, char *file, char *param)
        s = calloc_a(sizeof(*s), &f, strlen(file) + 1, &p, strlen(param) + 1);
        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->param = p;
        s->file = f;
        strcpy(s->param, param);