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

diff --git a/rcS.c b/rcS.c
index f041f09..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;
-		log_printf(buf->data);
+		syslog(LOG_NOTICE, "%s", str);
+#ifdef SHOW_BOOT_ON_CONSOLE
+		fprintf(stderr, "%s\n", str);
+#endif
 		ustream_consume(s, len);
 	} while (1);
 }
@@ -66,7 +68,7 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 	int pipefd[2];
 	pid_t pid;
 
-	DEBUG(1, "start %s %s \n", s->file, s->param);
+	DEBUG(2, "start %s %s \n", s->file, s->param);
 	if (pipe(pipefd) == -1) {
 		ERROR("Failed to create pipe\n");
 		return;
@@ -96,7 +98,7 @@ static void q_initd_complete(struct runqueue *q, struct runqueue_task *p)
 {
 	struct initd *s = container_of(p, struct initd, proc.task);
 
-	DEBUG(1, "stop %s %s \n", s->file, s->param);
+	DEBUG(2, "stop %s %s \n", s->file, s->param);
 	ustream_free(&s->fd.stream);
 	close(s->fd.fd.fd);
 	free(s);
@@ -110,32 +112,47 @@ static void add_initd(struct runqueue *q, char *file, char *param)
 		.kill = runqueue_process_kill_cb,
 	};
 	struct initd *s;
+	char *p, *f;
 
-	s = calloc(1, sizeof(*s));
+	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->param = param;
-	s->file = file;
+	if (!strcmp(param, "stop") || !strcmp(param, "shutdown"))
+		s->proc.task.run_timeout = 15000;
+	s->param = p;
+	s->file = f;
+	strcpy(s->param, param);
+	strcpy(s->file, file);
 	runqueue_task_add(q, &s->proc.task, false);
 }
 
 static int _rc(struct runqueue *q, char *path, const char *file, char *pattern, char *param)
 {
-	char dir[64];
+	char *dir = alloca(2 + strlen(path) + strlen(file) + strlen(pattern));
 	glob_t gl;
 	int j;
 
+	if (!dir) {
+		ERROR("Out of memory in %s.\n", file);
+		return -1;
+	}
 
-	DEBUG(1, "running %s/%s%s %s\n", path, file, pattern, param);
-	snprintf(dir, sizeof(dir), "%s/%s%s", path, file, pattern);
+	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)) {
-		printf("glob failed on %s\n", dir);
+		DEBUG(2, "glob failed on %s\n", dir);
 		return -1;
 	}
 
 	for (j = 0; j < gl.gl_pathc; j++)
 		add_initd(q, gl.gl_pathv[j], param);
 
+	globfree(&gl);
+
 	return 0;
 }
 
@@ -158,8 +175,8 @@ static void r_empty(struct runqueue *q)
 
 }
 
-static void __attribute__((constructor)) measure_init() {
+static void __attribute__((constructor)) rc_init() {
 	runqueue_init(&r);
 	r.empty_cb = r_empty;
-	r.max_running_tasks = 1;
+	r.max_running_tasks = 8;
 }