summaryrefslogtreecommitdiffstats
path: root/initd
diff options
context:
space:
mode:
authorMichel Stam <m.stam@fugro.nl>2014-10-13 16:14:34 +0200
committerJohn Crispin <blogic@openwrt.org>2014-10-12 13:24:11 +0200
commit79872ea6ca5867631c1ec5405721af12bea818b2 (patch)
tree86fd9034e2940b00405cda98aca084fac6e3a4d5 /initd
parentf45672d80bf2fec4ccb7363de1da6adb9e3f4421 (diff)
downloadunitd-79872ea6ca5867631c1ec5405721af12bea818b2.tar
unitd-79872ea6ca5867631c1ec5405721af12bea818b2.zip
Use one generic routine to access /proc/cmdline
Signed-off-by: Michel Stam <m.stam@fugro.nl>
Diffstat (limited to 'initd')
-rw-r--r--initd/init.c28
1 files changed, 11 insertions, 17 deletions
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 <libubox/uloop.h>
#include <libubus.h>
+#include <limits.h>
#include <stdlib.h>
#include <fcntl.h>
#include <getopt.h>
@@ -28,6 +29,7 @@
#include <unistd.h>
#include <stdio.h>
+#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