X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=inittab.c;h=2d9a1e08d25faaddbfdd6297b560a85f2e3530ad;hp=a9c3535eba506e89c010f84b5199eee457eb3cd0;hb=79872ea6;hpb=5735eda87465c1f800aa1a66cd47d28f02d3e1a3

diff --git a/inittab.c b/inittab.c
index a9c3535..2d9a1e0 100644
--- a/inittab.c
+++ b/inittab.c
@@ -20,10 +20,12 @@
 #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"
 
@@ -134,30 +136,20 @@ static void askfirst(struct init_action *a)
 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];
-
-	if (fd < 0)
-		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];
+	char line[256], *tty, *split;
+	int i;
 
+	tty = get_cmdline_val("console", line, sizeof(line));
+	split=strchr(tty, ',');
+	if (split != NULL)
+		split = '\0';
+	
 	chdir("/dev");
 	i = stat(tty, &s);
 	chdir("/");
 	if (i) {
 		DEBUG(4, "skipping %s\n", tty);
-		goto err_out;
+		return;
 	}
 	console = strdup(tty);
 
@@ -170,9 +162,6 @@ static void askconsole(struct init_action *a)
 
 	a->proc.cb = child_exit;
 	fork_worker(a);
-
-err_out:
-	regfree(&pat_cmdline);
 }
 
 static void rcrespawn(struct init_action *a)
@@ -258,6 +247,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;
@@ -273,7 +267,7 @@ void procd_inittab(void)
 		};
 
 		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, " ");
 		}