[PATCH] change call_foreach_file to return a list

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index 5e204488d2e1462cce9d63a6e54aaa59af2b0e7a..45b11de2aa573ef3485e7ef80fe5a6e8a0843e9a 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -21,9 +21,6 @@
  *
  */
 
-/* define this to enable parsing debugging */
-/* #define DEBUG_PARSER */
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -33,18 +30,19 @@
 #include <ctype.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
-#include "namedev.h"
+#include "udev_rules.h"
 
 /* global variables */
-char sysfs_path[SYSFS_PATH_MAX];
-char udev_root[PATH_MAX];
-char udev_db_path[PATH_MAX+NAME_MAX];
-char udev_rules_filename[PATH_MAX+NAME_MAX];
-char udev_config_filename[PATH_MAX+NAME_MAX];
+char sysfs_path[PATH_SIZE];
+char udev_root[PATH_SIZE];
+char udev_db_path[PATH_SIZE];
+char udev_rules_filename[PATH_SIZE];
+char udev_config_filename[PATH_SIZE];
 int udev_log;
 int udev_dev_d;
 int udev_hotplug_d;
@@ -61,6 +59,54 @@ static int string_is_true(const char *str)
        return 0;
 }
 
+static int get_key(char **line, char **key, char **value)
+{
+       char *linepos;
+       char *temp;
+
+       linepos = *line;
+       if (!linepos)
+               return -1;
+
+       /* skip whitespace */
+       while (isspace(linepos[0]))
+               linepos++;
+
+       /* get the key */
+       *key = linepos;
+       while (1) {
+               linepos++;
+               if (linepos[0] == '\0')
+                       return -1;
+               if (isspace(linepos[0]))
+                       break;
+               if (linepos[0] == '=')
+                       break;
+       }
+
+       /* terminate key */
+       linepos[0] = '\0';
+       linepos++;
+
+       /* skip whitespace */
+       while (isspace(linepos[0]))
+               linepos++;
+
+       /* get the value*/
+       if (linepos[0] == '"')
+               linepos++;
+       else
+               return -1;
+       *value = linepos;
+
+       temp = strchr(linepos, '"');
+       if (!temp)
+               return -1;
+       temp[0] = '\0';
+
+       return 0;
+}
+
 static void init_variables(void)
 {
        const char *env;
@@ -88,7 +134,7 @@ static int parse_config_file(void)
 {
        char line[LINE_SIZE];
        char *bufline;
-       char *temp;
+       char *linepos;
        char *variable;
        char *value;
        char *buf;
@@ -98,12 +144,11 @@ static int parse_config_file(void)
        int lineno;
        int retval = 0;
 
-       if (file_map(udev_config_filename, &buf, &bufsize) == 0) {
-               dbg("reading '%s' as config file", udev_config_filename);
-       } else {
+       if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
                dbg("can't open '%s' as config file", udev_config_filename);
                return -ENODEV;
        }
+       dbg("reading '%s' as config file", udev_config_filename);
 
        /* loop through the whole file */
        lineno = 0;
@@ -114,7 +159,7 @@ static int parse_config_file(void)
                cur += count+1;
                lineno++;
 
-               if (count >= LINE_SIZE) {
+               if (count >= sizeof(line)) {
                        info("line too long, conf line skipped %s, line %d",
                                        udev_config_filename, lineno);
                        continue;
@@ -132,32 +177,32 @@ static int parse_config_file(void)
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
-               strncpy(line, bufline, count);
-               line[count] = '\0';
-               temp = line;
-               dbg_parse("read '%s'", temp);
+               strlcpy(line, bufline, count);
+               dbg("read '%s'", line);
 
-               retval = parse_get_pair(&temp, &variable, &value);
-               if (retval != 0)
-                       info("%s:%d:%Zd: error parsing '%s'",
-                            udev_config_filename, lineno, temp-line, temp);
+               linepos = line;
+               retval = get_key(&linepos, &variable, &value);
+               if (retval != 0) {
+                       info("error parsing %s, line %d:%d", udev_config_filename, lineno, (int) (linepos-line));
+                       continue;
+               }
 
-               dbg_parse("variable='%s', value='%s'", variable, value);
+               dbg("variable='%s', value='%s'", variable, value);
 
                if (strcasecmp(variable, "udev_root") == 0) {
-                       strfieldcpy(udev_root, value);
+                       strlcpy(udev_root, value, sizeof(udev_root));
                        no_trailing_slash(udev_root);
                        continue;
                }
 
                if (strcasecmp(variable, "udev_db") == 0) {
-                       strfieldcpy(udev_db_path, value);
+                       strlcpy(udev_db_path, value, sizeof(udev_db_path));
                        no_trailing_slash(udev_db_path);
                        continue;
                }
 
                if (strcasecmp(variable, "udev_rules") == 0) {
-                       strfieldcpy(udev_rules_filename, value);
+                       strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
                        no_trailing_slash(udev_rules_filename);
                        continue;
                }
@@ -172,26 +217,25 @@ static int parse_config_file(void)
        return retval;
 }
 
-static void get_dirs(void)
+void udev_init_config(void)
 {
-       char *temp;
-       int retval;
 
-       retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-       if (retval)
-               dbg("sysfs_get_mnt_path failed");
+       init_variables();
+       sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
 
        /* see if we should try to override any of the default values */
        if (getenv("UDEV_TEST") != NULL) {
+               char *temp;
+
                temp = getenv("SYSFS_PATH");
                if (temp != NULL) {
-                       strfieldcpy(sysfs_path, temp);
+                       strlcpy(sysfs_path, temp, sizeof(sysfs_path));
                        no_trailing_slash(sysfs_path);
                }
 
                temp = getenv("UDEV_CONFIG_FILE");
                if (temp != NULL)
-                       strfieldcpy(udev_config_filename, temp);
+                       strlcpy(udev_config_filename, temp, sizeof(udev_config_filename));
        }
 
        parse_config_file();
@@ -202,9 +246,3 @@ static void get_dirs(void)
        dbg("udev_rules_filename='%s'", udev_rules_filename);
        dbg("udev_log=%d", udev_log);
 }
-
-void udev_init_config(void)
-{
-       init_variables();
-       get_dirs();
-}