inittab: strip trailing whitespace (especially newline)

[project/procd.git] / inittab.c

diff --git a/inittab.c b/inittab.c
index e935ece..677ec47 100644 (file)
--- a/inittab.c
+++ b/inittab.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <regex.h>
+#include <ctype.h>
 
 #include <libubox/utils.h>
 #include <libubox/list.h>
@@ -249,7 +250,7 @@ void procd_inittab(void)
                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));
@@ -258,6 +259,11 @@ void procd_inittab(void)
                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;