#include <stdlib.h>
#include <unistd.h>
#include <regex.h>
+#include <ctype.h>
#include <libubox/utils.h>
#include <libubox/list.h>
#include "procd.h"
+#include "rcS.h"
#define TAG_ID 0
#define TAG_RUNLVL 1
struct init_handler {
const char *name;
void (*cb) (struct init_action *a);
- int atomic;
+ int multi;
};
struct init_action {
struct init_handler *handler;
struct uloop_process proc;
- int pending;
int respawn;
struct uloop_timeout tout;
};
static const char *tab = "/etc/inittab";
static char *ask = "/sbin/askfirst";
-static struct init_action *pending;
-
static LIST_HEAD(actions);
-static void fork_script(struct init_action *a)
+static void fork_worker(struct init_action *a)
{
a->proc.pid = fork();
if (!a->proc.pid) {
}
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);
- if (a->tout.cb) {
- uloop_timeout_set(&a->tout, a->respawn);
- } else {
- a->pending = 0;
- pending = NULL;
- procd_state_next();
- }
+ DEBUG(4, "pid:%d\n", proc->pid);
+ uloop_timeout_set(&a->tout, a->respawn);
}
static void respawn(struct uloop_timeout *tout)
{
struct init_action *a = container_of(tout, struct init_action, tout);
- fork_script(a);
+ fork_worker(a);
}
-static void runscript(struct init_action *a)
+static void rcdone(struct runqueue *q)
{
- a->proc.cb = child_exit;
- fork_script(a);
+ procd_state_next();
+}
+
+static void runrc(struct init_action *a)
+{
+ if (!a->argv[1] || !a->argv[2]) {
+ ERROR("valid format is rcS <S|K> <param>\n");
+ return;
+ }
+ rcS(a->argv[1], a->argv[2], rcdone);
}
static void askfirst(struct init_action *a)
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;
}
a->respawn = 500;
a->proc.cb = child_exit;
- fork_script(a);
+ fork_worker(a);
}
static void askconsole(struct init_action *a)
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);
a->respawn = 500;
a->proc.cb = child_exit;
- fork_script(a);
+ fork_worker(a);
+
err_out:
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",
- .cb = runscript,
+ .cb = runrc,
}, {
.name = "shutdown",
- .cb = runscript,
+ .cb = runrc,
}, {
.name = "askfirst",
.cb = askfirst,
- .atomic = 1,
+ .multi = 1,
}, {
.name = "askconsole",
.cb = askconsole,
- .atomic = 1,
+ .multi = 1,
+ }, {
+ .name = "respawn",
+ .cb = rcrespawn,
+ .multi = 1,
}
};
list_for_each_entry(a, &actions, list)
if (!strcmp(a->handler->name, handler)) {
- if (a->handler->atomic) {
+ if (a->handler->multi) {
a->handler->cb(a);
continue;
}
- if (pending || a->pending)
- break;
- a->pending = 1;
- pending = a;
a->handler->cb(a);
+ break;
}
}
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';
};
tok = strtok(tags[TAG_PROCESS], " ");
- for (i = 0; i < (MAX_ARGS - i - 1) && tok; i++) {
+ for (i = 0; i < (MAX_ARGS - 1) && tok; i++) {
a->argv[i] = tok;
tok = strtok(NULL, " ");
}