X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=initd%2Finit.c;h=d8490f8505c09a08857464386593ad5f5a40cf2a;hp=153b3c2d8efd21e5290d31ef7fc330a3da66f755;hb=79872ea6ca5867631c1ec5405721af12bea818b2;hpb=61e88ee49ade4fd8014bb11ca3166d93274c50e8 diff --git a/initd/init.c b/initd/init.c index 153b3c2..d8490f8 100644 --- a/initd/init.c +++ b/initd/init.c @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -28,6 +29,7 @@ #include #include +#include "../utils/utils.h" #include "init.h" #include "../watchdog.h" @@ -53,24 +55,16 @@ static struct sigaction sa_shutdown = { static void cmdline(void) { - char line[1024]; - int 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, "init_debug=([0-9]+)", REG_EXTENDED); - if (!regexec(&pat_cmdline, line, 2, matches, 0)) { - line[matches[1].rm_eo] = '\0'; - debug = atoi(&line[matches[1].rm_so]); + char line[20]; + char* res; + long r; + + res = get_cmdline_val("init_debug", line, sizeof(line)); + if (res != NULL) { + r = strtol(line, NULL, 10); + if ((r != LONG_MIN) && (r != LONG_MAX)) + debug = (int) r; } - regfree(&pat_cmdline); } int