[PATCH] netdev - udevdb+dev.d changes

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index 1d05a3fb13cfb55a11b23e51968ccb6384955133..fe26850a87f69e7cc5e2036ba44c2d58c4217f89 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -31,9 +31,10 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
-#include <sysfs/libsysfs.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
@@ -50,6 +51,7 @@ char default_owner_str[OWNER_SIZE];
 char default_group_str[GROUP_SIZE];
 int udev_log;
 int udev_sleep;
+int udev_dev_d;
 
 
 static int string_is_true(char *str)
@@ -76,12 +78,16 @@ static void init_variables(void)
        udev_sleep = 1;
        if (getenv("UDEV_NO_SLEEP") != NULL)
                udev_sleep = 0;
+
+       udev_dev_d = 1;
+       if (getenv("UDEV_NO_DEVD") != NULL)
+               udev_dev_d = 0;
 }
 
 #define set_var(_name, _var)                           \
        if (strcasecmp(variable, _name) == 0) {         \
                dbg_parse("%s = '%s'", _name, value);   \
-               strncpy(_var, value, sizeof(_var));     \
+               strfieldcpymax(_var, value, sizeof(_var));\
        }
 
 #define set_bool(_name, _var)                          \
@@ -131,12 +137,14 @@ static int parse_config_file(void)
        char *temp;
        char *variable;
        char *value;
-       FILE *fd;
-       int lineno = 0;
+       char *buf;
+       size_t bufsize;
+       size_t cur;
+       size_t count;
+       int lineno;
        int retval = 0;
-       
-       fd = fopen(udev_config_filename, "r");
-       if (fd != NULL) {
+
+       if (file_map(udev_config_filename, &buf, &bufsize) == 0) {
                dbg("reading '%s' as config file", udev_config_filename);
        } else {
                dbg("can't open '%s' as config file", udev_config_filename);
@@ -144,13 +152,20 @@ static int parse_config_file(void)
        }
 
        /* loop through the whole file */
+       lineno = 0;
+       cur = 0;
        while (1) {
-               /* get a line */
-               temp = fgets(line, sizeof(line), fd);
-               if (temp == NULL)
-                       goto exit;
+               count = buf_get_line(buf, bufsize, cur);
+
+               strncpy(line, buf + cur, count);
+               line[count] = '\0';
+               temp = line;
                lineno++;
 
+               cur += count+1;
+               if (cur > bufsize)
+                       break;
+
                dbg_parse("read '%s'", temp);
 
                /* eat the whitespace at the beginning of the line */
@@ -182,8 +197,8 @@ static int parse_config_file(void)
        }
        dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
                  lineno, temp - line, temp);
-exit:
-       fclose(fd);
+
+       file_unmap(buf, bufsize);
        return retval;
 }