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

diff --git a/rcS.c b/rcS.c
index 58f195b..1e38d39 100644
--- a/rcS.c
+++ b/rcS.c
@@ -31,7 +31,7 @@
 #include "procd.h"
 #include "rcS.h"
 
-static struct runqueue q;
+static struct runqueue q, r;
 
 struct initd {
 	struct ustream_fd fd;
@@ -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(6, 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;
@@ -92,17 +94,17 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 	exit(1);
 }
 
-static void q_initd_complete(struct runqueue *q, struct runqueue_process *p, int ret)
+static void q_initd_complete(struct runqueue *q, struct runqueue_task *p)
 {
-	struct initd *s = container_of(p, struct initd, proc);
+	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);
 }
 
-static void add_initd(char *file, char *param)
+static void add_initd(struct runqueue *q, char *file, char *param)
 {
 	static const struct runqueue_task_type initd_type = {
 		.run = q_initd_run,
@@ -110,34 +112,71 @@ static void add_initd(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.complete = q_initd_complete;
-	s->param = param;
-	s->file = file;
-	runqueue_task_add(&q, &s->proc.task, false);
+	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);
+	strcpy(s->file, file);
+	runqueue_task_add(q, &s->proc.task, false);
 }
 
-int rcS(char *pattern, char *param, void (*q_empty)(struct runqueue *))
+static int _rc(struct runqueue *q, char *path, const char *file, char *pattern, char *param)
 {
-	char dir[16];
+	char *dir = alloca(2 + strlen(path) + strlen(file) + strlen(pattern));
 	glob_t gl;
 	int j;
 
-	runqueue_init(&q);
-	q.empty_cb = q_empty;
-	q.max_running_tasks = 1;
+	if (!dir) {
+		ERROR("Out of memory in %s.\n", file);
+		return -1;
+	}
 
-	DEBUG(1, "running /etc/rc.d/%s %s\n", pattern, param);
-	snprintf(dir, sizeof(dir), "/etc/rc.d/%s*", 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(gl.gl_pathv[j], param);
+		add_initd(q, gl.gl_pathv[j], param);
+
+	globfree(&gl);
 
 	return 0;
 }
+
+int rcS(char *pattern, char *param, void (*q_empty)(struct runqueue *))
+{
+	runqueue_init(&q);
+	q.empty_cb = q_empty;
+	q.max_running_tasks = 1;
+
+	return _rc(&q, "/etc/rc.d", pattern, "*", param);
+}
+
+int rc(const char *file, char *param)
+{
+	return _rc(&r, "/etc/init.d", file, "", param);
+}
+
+static void r_empty(struct runqueue *q)
+{
+
+}
+
+static void __attribute__((constructor)) rc_init() {
+	runqueue_init(&r);
+	r.empty_cb = r_empty;
+	r.max_running_tasks = 8;
+}