procd: shift arguments for askfirst only once

[project/procd.git] / inittab.c

diff --git a/inittab.c b/inittab.c
index 21172f7c065cdc9474ca037398757e9b78b026a8..1cfef2ba78c69f5e26fe4cce66585f9520e314e4 100644 (file)
--- a/inittab.c
+++ b/inittab.c
@@ -104,7 +104,7 @@ static void fork_worker(struct init_action *a)
                tcsetpgrp(STDIN_FILENO, p);
 
                execvp(a->argv[0], a->argv);
-               ERROR("Failed to execute %s\n", a->argv[0]);
+               ERROR("Failed to execute %s: %m\n", a->argv[0]);
                exit(-1);
        }
 
@@ -120,14 +120,22 @@ static void child_exit(struct uloop_process *proc, int ret)
 {
        struct init_action *a = container_of(proc, struct init_action, proc);
 
-       DEBUG(4, "pid:%d\n", proc->pid);
-        uloop_timeout_set(&a->tout, a->respawn);
+       DEBUG(4, "pid:%d, exitcode:%d\n", proc->pid, ret);
+       proc->pid = 0;
+
+       if (!dev_exist(a->id)) {
+               DEBUG(4, "Skipping respawn: device '%s' does not exist anymore\n", a->id);
+               return;
+       }
+
+       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_worker(a);
+       if (!a->proc.pid)
+               fork_worker(a);
 }
 
 static void rcdone(struct runqueue *q)
@@ -157,13 +165,17 @@ static void askfirst(struct init_action *a)
        }
 
        a->tout.cb = respawn;
-       for (i = MAX_ARGS - 1; i >= 1; i--)
-               a->argv[i] = a->argv[i - 1];
-       a->argv[0] = ask;
+       /* shift arguments only if not yet done */
+       if (a->argv[0] != ask) {
+               for (i = MAX_ARGS - 1; i >= 1; i--)
+                       a->argv[i] = a->argv[i - 1];
+               a->argv[0] = ask;
+       }
        a->respawn = 500;
 
        a->proc.cb = child_exit;
-       fork_worker(a);
+       if (!a->proc.pid)
+               fork_worker(a);
 }
 
 static void askconsole(struct init_action *a)
@@ -191,13 +203,17 @@ static void askconsole(struct init_action *a)
        }
 
        a->tout.cb = respawn;
-       for (i = MAX_ARGS - 1; i >= 1; i--)
-               a->argv[i] = a->argv[i - 1];
-       a->argv[0] = ask;
+       /* shift arguments only if not yet done */
+       if (a->argv[0] != ask) {
+               for (i = MAX_ARGS - 1; i >= 1; i--)
+                       a->argv[i] = a->argv[i - 1];
+               a->argv[0] = ask;
+       }
        a->respawn = 500;
 
        a->proc.cb = child_exit;
-       fork_worker(a);
+       if (!a->proc.pid)
+               fork_worker(a);
 }
 
 static void rcrespawn(struct init_action *a)
@@ -206,7 +222,8 @@ static void rcrespawn(struct init_action *a)
        a->respawn = 500;
 
        a->proc.cb = child_exit;
-       fork_worker(a);
+       if (!a->proc.pid)
+               fork_worker(a);
 }
 
 static struct init_handler handlers[] = {
@@ -278,14 +295,13 @@ void procd_inittab(void)
        char *line;
 
        if (!fp) {
-               ERROR("Failed to open %s\n", tab);
+               ERROR("Failed to open %s: %m\n", tab);
                return;
        }
 
        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));
+       a = calloc(1, sizeof(struct init_action));
 
        while (fgets(line, LINE_LEN, fp)) {
                char *tags[TAG_PROCESS + 1];
@@ -322,8 +338,7 @@ void procd_inittab(void)
                if (add_action(a, tags[TAG_ACTION]))
                        continue;
                line = malloc(LINE_LEN);
-               a = malloc(sizeof(struct init_action));
-               memset(a, 0, sizeof(struct init_action));
+               a = calloc(1, sizeof(struct init_action));
        }
 
        fclose(fp);