[PATCH] DEVPATH for netdev

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index 6d39d294e1dba8843e93549eeae839f943fbad6c..ba04003e909285c89349f2178c4d1f82da37dd38 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -32,11 +32,12 @@
 #include <errno.h>
 #include <ctype.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char sysfs_path[SYSFS_PATH_MAX];
@@ -48,8 +49,20 @@ char udev_config_filename[PATH_MAX+NAME_MAX];
 char default_mode_str[MODE_SIZE];
 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)
+{
+       if (strcasecmp(str, "true") == 0)
+               return 1;
+       if (strcasecmp(str, "yes") == 0)
+               return 1;
+       return 0;
+}
+
 static void init_variables(void)
 {
        /* fill up the defaults.  
@@ -60,12 +73,27 @@ static void init_variables(void)
        strfieldcpy(udev_config_filename, UDEV_CONFIG_FILE);
        strfieldcpy(udev_rules_filename, UDEV_RULES_FILE);
        strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
+       udev_log = string_is_true(UDEV_LOG_DEFAULT);
+
+       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));     \
+               dbg_parse("%s='%s'", _name, value);     \
+               strfieldcpy(_var, value);\
+       }
+
+#define set_bool(_name, _var)                          \
+       if (strcasecmp(variable, _name) == 0) {         \
+               dbg_parse("%s='%s'", _name, value);     \
+               _var = string_is_true(value);           \
        }
 
 int parse_get_pair(char **orig_string, char **left, char **right)
@@ -109,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);
@@ -122,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 */
@@ -156,11 +193,12 @@ static int parse_config_file(void)
                set_var("default_mode", default_mode_str);
                set_var("default_owner", default_owner_str);
                set_var("default_group", default_group_str);
+               set_bool("udev_log", udev_log);
        }
        dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
                  lineno, temp - line, temp);
-exit:
-       fclose(fd);
+
+       file_unmap(buf, bufsize);
        return retval;
 }
 
@@ -191,6 +229,7 @@ static void get_dirs(void)
        dbg_parse("udev_db_filename = %s", udev_db_filename);
        dbg_parse("udev_rules_filename = %s", udev_rules_filename);
        dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
+       dbg_parse("udev_log = %d", udev_log);
        parse_config_file();
 
        dbg_parse("udev_root = %s", udev_root);
@@ -198,6 +237,7 @@ static void get_dirs(void)
        dbg_parse("udev_db_filename = %s", udev_db_filename);
        dbg_parse("udev_rules_filename = %s", udev_rules_filename);
        dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
+       dbg_parse("udev_log_str = %d", udev_log);
 }
 
 void udev_init_config(void)