#include <stdlib.h>
#include <unistd.h>
#include <regex.h>
+#include <ctype.h>
#include <libubox/utils.h>
#include <libubox/list.h>
}
if (a->proc.pid > 0) {
- DEBUG(2, "Launched new %s action, pid=%d\n",
+ DEBUG(4, "Launched new %s action, pid=%d\n",
a->handler->name,
(int) a->proc.pid);
uloop_process_add(&a->proc);
{
struct init_action *a = container_of(proc, struct init_action, proc);
- DEBUG(2, "pid:%d\n", proc->pid);
+ DEBUG(4, "pid:%d\n", proc->pid);
uloop_timeout_set(&a->tout, a->respawn);
}
i = stat(a->id, &s);
chdir("/");
if (i || (console && !strcmp(console, a->id))) {
- DEBUG(2, "Skipping %s\n", a->id);
+ DEBUG(4, "Skipping %s\n", a->id);
return;
}
regex_t pat_cmdline;
regmatch_t matches[2];
- if (!fd)
+ if (fd < 0)
return;
r = read(fd, line, sizeof(line) - 1);
i = stat(tty, &s);
chdir("/");
if (i) {
- DEBUG(2, "skipping %s\n", tty);
+ DEBUG(4, "skipping %s\n", tty);
goto err_out;
}
console = strdup(tty);
regfree(&pat_cmdline);
}
+static void rcrespawn(struct init_action *a)
+{
+ a->tout.cb = respawn;
+ a->respawn = 500;
+
+ a->proc.cb = child_exit;
+ fork_worker(a);
+}
+
static struct init_handler handlers[] = {
{
.name = "sysinit",
.name = "askconsole",
.cb = askconsole,
.multi = 1,
+ }, {
+ .name = "respawn",
+ .cb = rcrespawn,
+ .multi = 1,
}
};
return;
}
- regcomp(&pat_inittab, "([a-zA-Z0-9]*):([a-zA-Z0-9]*):([a-zA-Z0-9]*):([a-zA-Z0-9/[.-.]. ]*)", REG_EXTENDED);
+ regcomp(&pat_inittab, "([a-zA-Z0-9]*):([a-zA-Z0-9]*):([a-zA-Z0-9]*):(.*)", REG_EXTENDED);
line = malloc(LINE_LEN);
a = malloc(sizeof(struct init_action));
memset(a, 0, sizeof(struct init_action));
char *tags[TAG_PROCESS + 1];
char *tok;
int i;
+ int len = strlen(line);
+
+ while (isspace(line[len - 1]))
+ len--;
+ line[len] = 0;
if (*line == '#')
continue;
if (regexec(&pat_inittab, line, 5, matches, 0))
continue;
- DEBUG(2, "Parsing inittab - %s", line);
+ DEBUG(4, "Parsing inittab - %s", line);
for (i = TAG_ID; i <= TAG_PROCESS; i++) {
line[matches[i].rm_eo] = '\0';