#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/ioctl.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <regex.h>
+#include <ctype.h>
#include <libubox/utils.h>
#include <libubox/list.h>
+#include "utils/utils.h"
#include "procd.h"
#include "rcS.h"
#define MAX_ARGS 8
struct init_action;
-const char *console;
+char *console = NULL;
struct init_handler {
const char *name;
static LIST_HEAD(actions);
+static int dev_open(const char *dev)
+{
+ int fd = -1;
+
+ if (dev) {
+ if (chdir("/dev"))
+ ERROR("failed to change dir to /dev\n");
+ fd = open(dev, O_RDWR);
+ if (chdir("/"))
+ ERROR("failed to change dir to /\n");
+ }
+
+ return fd;
+}
+
+static int dev_exist(const char *dev)
+{
+ int res;
+
+ res = dev_open(dev);
+ if (res != -1)
+ close(res);
+
+ return (res != -1);
+}
+
static void fork_worker(struct init_action *a)
{
+ int fd;
+ pid_t p;
+
a->proc.pid = fork();
if (!a->proc.pid) {
+ p = setsid();
+
+ fd = dev_open(a->id);
+ if (fd != -1)
+ {
+ dup2(fd, STDIN_FILENO);
+ dup2(fd, STDOUT_FILENO);
+ dup2(fd, STDERR_FILENO);
+ if (fd > STDERR_FILENO)
+ close(fd);
+ }
+
+ ioctl(STDIN_FILENO, TIOCSCTTY, 1);
+ tcsetpgrp(STDIN_FILENO, p);
+
execvp(a->argv[0], a->argv);
ERROR("Failed to execute %s\n", a->argv[0]);
exit(-1);
}
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);
}
ERROR("valid format is rcS <S|K> <param>\n");
return;
}
- rcS(a->argv[1], a->argv[2], rcdone);
+
+ /* proceed even if no init or shutdown scripts run */
+ if (rcS(a->argv[1], a->argv[2], rcdone))
+ rcdone(NULL);
}
static void askfirst(struct init_action *a)
{
- struct stat s;
int i;
- chdir("/dev");
- i = stat(a->id, &s);
- chdir("/");
- if (i || (console && !strcmp(console, a->id))) {
- DEBUG(2, "Skipping %s\n", a->id);
+ if (!dev_exist(a->id) || (console && !strcmp(console, a->id))) {
+ DEBUG(4, "Skipping %s\n", a->id);
return;
}
a->tout.cb = respawn;
- for (i = MAX_ARGS - 2; i >= 2; i--)
- a->argv[i] = a->argv[i - 2];
+ for (i = MAX_ARGS - 1; i >= 1; i--)
+ a->argv[i] = a->argv[i - 1];
a->argv[0] = ask;
- a->argv[1] = a->id;
a->respawn = 500;
a->proc.cb = child_exit;
static void askconsole(struct init_action *a)
{
- struct stat s;
- char line[256], *tty;
- int i, r, fd = open("/proc/cmdline", O_RDONLY);
- regex_t pat_cmdline;
- regmatch_t matches[2];
+ char line[256], *tty, *split;
+ int i;
- if (!fd)
- return;
+ tty = get_cmdline_val("console", line, sizeof(line));
+ if (tty != NULL) {
+ split = strchr(tty, ',');
+ if (split != NULL)
+ *split = '\0';
+
+ if (!dev_exist(tty)) {
+ DEBUG(4, "skipping %s\n", tty);
+ return;
+ }
- r = read(fd, line, sizeof(line) - 1);
- line[r] = '\0';
- close(fd);
-
- regcomp(&pat_cmdline, "console=([a-zA-Z0-9]*)", REG_EXTENDED);
- if (regexec(&pat_cmdline, line, 2, matches, 0))
- goto err_out;
- line[matches[1].rm_eo] = '\0';
- tty = &line[matches[1].rm_so];
-
- chdir("/dev");
- i = stat(tty, &s);
- chdir("/");
- if (i) {
- DEBUG(2, "skipping %s\n", tty);
- goto err_out;
+ console = strdup(tty);
+ a->id = strdup(tty);
+ }
+ else {
+ console = NULL;
+ a->id = NULL;
}
- console = strdup(tty);
a->tout.cb = respawn;
- for (i = MAX_ARGS - 2; i >= 2; i--)
- a->argv[i] = a->argv[i - 2];
+ for (i = MAX_ARGS - 1; i >= 1; i--)
+ a->argv[i] = a->argv[i - 1];
a->argv[0] = ask;
- a->argv[1] = strdup(tty);
a->respawn = 500;
a->proc.cb = child_exit;
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 = "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';
};
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, " ");
}
projects / project / procd.git / blobdiff