X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=rcS.c;h=1e38d39e511fd280904bc7b6f3b315eb7ff60b4f;hp=395d992590d6d498204fa40ba54893ec75bd5cd8;hb=0cf8b0576a66ca28aeec98e19dc9c1cbf4324894;hpb=21d307367eb991f7494ce43087a5edb94288d08f

diff --git a/rcS.c b/rcS.c
index 395d992..1e38d39 100644
--- 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(LOG_NOTICE, "%s", str);
+#ifdef SHOW_BOOT_ON_CONSOLE
+		fprintf(stderr, "%s\n", str);
+#endif
 		ustream_consume(s, len);
 	} while (1);
 }
@@ -113,8 +115,14 @@ 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;
+	if (!strcmp(param, "stop") || !strcmp(param, "shutdown"))
+		s->proc.task.run_timeout = 15000;
 	s->param = p;
 	s->file = f;
 	strcpy(s->param, param);
@@ -128,6 +136,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)) {