procd: Make askconsole work again when no tty is specified in inittab

[project/procd.git] / inittab.c

diff --git a/inittab.c b/inittab.c
index 0d62708..be18482 100644 (file)
--- a/inittab.c
+++ b/inittab.c
@@ -37,7 +37,7 @@
 #define MAX_ARGS       8
 
 struct init_action;
 #define MAX_ARGS       8
 
 struct init_action;

-const char *console;
+char *console = NULL;

 
 struct init_handler {
        const char *name;
 
 struct init_handler {
        const char *name;


@@ -172,19 +172,27 @@ static void askconsole(struct init_action *a)
        int i;
 
        tty = get_cmdline_val("console", line, sizeof(line));
        int i;
 
        tty = get_cmdline_val("console", line, sizeof(line));

-       split = strchr(tty, ',');
-       if (split)
-               *split = '\0';
+       if (tty != NULL) {
+               split = strchr(tty, ',');
+               if (split != NULL)
+                       *split = '\0';
+
+               if (!dev_exist(tty)) {
+                       DEBUG(4, "skipping %s\n", tty);
+                       return;
+               }

 
 

-       if (!dev_exist(tty)) {
-               DEBUG(4, "skipping %s\n", tty);
-               return;
+               console = strdup(tty);
+               a->id = strdup(tty);
+       }
+       else {
+               console = NULL;
+               a->id = NULL;

        }
 
        a->tout.cb = respawn;
        for (i = MAX_ARGS - 1; i >= 1; i--)
                a->argv[i] = a->argv[i - 1];
        }
 
        a->tout.cb = respawn;
        for (i = MAX_ARGS - 1; i >= 1; i--)
                a->argv[i] = a->argv[i - 1];

-       a->id = strdup(tty);

        a->argv[0] = ask;
        a->respawn = 500;
 
        a->argv[0] = ask;
        a->respawn = 500;