ifupdown: fixes for custom MAC address, by Wade Berrier <wberrier AT gmail.com>

[oweals/busybox.git] / procps / sysctl.c

diff --git a/procps/sysctl.c b/procps/sysctl.c
index 6e582b0f942f37ce3e43e0e4f309b87696f0787a..79f0074c99370b4e3113d56ed9ae8a29d846e3ab 100644 (file)
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -95,13 +95,11 @@ static int sysctl_preload_file_and_exit(const char *filename)
        parser_t *parser;
 
        parser = config_open(filename);
-       if (!parser)
-               return 1;
-
-       while (config_read(parser, token, 2, 0, "# \t=", PARSE_LAST_IS_GREEDY)) { // TODO: ';' is comment char too
-               if (!token[1]) {
-                       bb_error_msg(WARN_BAD_LINE, filename, parser->lineno);
-               } else {
+       while (config_read(parser, token, 2, 2, "# \t=", PARSE_NORMAL)) { // TODO: ';' is comment char too
+//             if (!token[1]) {
+//                     bb_error_msg(WARN_BAD_LINE, filename, parser->lineno);
+//             } else {
+               {
 #if 0
                        char *s = xasprintf("%s=%s", token[0], token[1]);
                        sysctl_write_setting(s);
@@ -205,7 +203,7 @@ static int sysctl_read_setting(const char *name)
        while ((cptr = strchr(outname, '/')) != NULL)
                *cptr = '.';
 
-       fp = fopen(tmpname, "r");
+       fp = fopen_for_read(tmpname);
        if (fp == NULL) {
                switch (errno) {
                case ENOENT: