static void pipe_cb(struct ustream *s, int bytes)
{
- struct ustream_buf *buf = s->r.head;
char *newline, *str;
int len;
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);
}
.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(2, "running %s/%s%s %s\n", path, file, pattern, param);
- snprintf(dir, sizeof(dir), "%s/%s%s", path, file, pattern);
+ sprintf(dir, "%s/%s%s", path, file, pattern);
if (glob(dir, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl)) {
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;
}
}
-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;
}