[PATCH] cleanup PATCH for extras/chassis_id/Makefile

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index 51a91d009260db4b12a4710493818059863b9e56..ba2b3d2b886966eaa890d09673e9a64a310e79c8 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -60,11 +60,15 @@ static int string_is_true(char *str)
                return 1;
        if (strcasecmp(str, "yes") == 0)
                return 1;
+       if (strcasecmp(str, "1") == 0)
+               return 1;
        return 0;
 }
 
 static void init_variables(void)
 {
+       char *env;
+
        /* fill up the defaults.  
         * If any config values are specified, they will
         * override these values. */
@@ -76,11 +80,13 @@ static void init_variables(void)
        udev_log = string_is_true(UDEV_LOG_DEFAULT);
 
        udev_sleep = 1;
-       if (getenv("UDEV_NO_SLEEP") != NULL)
+       env = getenv("UDEV_NO_SLEEP");
+       if (env && string_is_true(env))
                udev_sleep = 0;
 
        udev_dev_d = 1;
-       if (getenv("UDEV_NO_DEVD") != NULL)
+       env = getenv("UDEV_NO_DEVD");
+       if (env && string_is_true(env))
                udev_dev_d = 0;
 }
 
@@ -121,7 +127,8 @@ int parse_get_pair(char **orig_string, char **left, char **right)
 
 static int parse_config_file(void)
 {
-       char line[255];
+       char line[LINE_SIZE];
+       char *bufline;
        char *temp;
        char *variable;
        char *value;
@@ -142,32 +149,35 @@ static int parse_config_file(void)
        /* loop through the whole file */
        lineno = 0;
        cur = 0;
-       while (1) {
+       while (cur < bufsize) {
                count = buf_get_line(buf, bufsize, cur);
-
-               strncpy(line, buf + cur, count);
-               line[count] = '\0';
-               temp = line;
-               lineno++;
-
+               bufline = &buf[cur];
                cur += count+1;
-               if (cur > bufsize)
-                       break;
-
-               dbg_parse("read '%s'", temp);
+               lineno++;
 
-               /* eat the whitespace at the beginning of the line */
-               while (isspace(*temp))
-                       ++temp;
+               if (count >= LINE_SIZE) {
+                       info("line too long, conf line skipped %s, line %d",
+                                       udev_config_filename, lineno);
+                       continue;
+               }
 
-               /* empty line? */
-               if (*temp == 0x00)
+               /* eat the whitespace */
+               while ((count > 0) && isspace(bufline[0])) {
+                       bufline++;
+                       count--;
+               }
+               if (count == 0)
                        continue;
 
                /* see if this is a comment */
-               if (*temp == COMMENT_CHARACTER)
+               if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
+               strncpy(line, bufline, count);
+               line[count] = '\0';
+               temp = line;
+               dbg_parse("read '%s'", temp);
+
                retval = parse_get_pair(&temp, &variable, &value);
                if (retval != 0)
                        info("%s:%d:%Zd: error parsing '%s'",