chiark / gitweb /
persistent rules: fix typo in dm rule
[elogind.git] / udev_rules_parse.c
index be07573..6bb83ae 100644 (file)
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
 #include "udev_rules.h"
 
 
@@ -89,7 +86,7 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
        char *temp;
 
        linepos = *line;
-       if (!linepos)
+       if (linepos == NULL && linepos[0] == '\0')
                return -1;
 
        /* skip whitespace */
@@ -97,7 +94,10 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
                linepos++;
 
        /* get the key */
+       if (linepos[0] == '\0')
+               return -1;
        *key = linepos;
+
        while (1) {
                linepos++;
                if (linepos[0] == '\0')
@@ -120,6 +120,8 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
        /* skip whitespace after key */
        while (isspace(linepos[0]))
                linepos++;
+       if (linepos[0] == '\0')
+               return -1;
 
        /* get operation type */
        if (linepos[0] == '=' && linepos[1] == '=') {
@@ -152,6 +154,8 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
        /* skip whitespace after operator */
        while (isspace(linepos[0]))
                linepos++;
+       if (linepos[0] == '\0')
+               return -1;
 
        /* get the value*/
        if (linepos[0] == '"')
@@ -362,6 +366,16 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                pos = strchr(file, ' ');
                                if (pos)
                                        pos[0] = '\0';
+
+                               /* allow programs in /lib/udev called without the path */
+                               if (strchr(file, '/') == NULL) {
+                                       strlcpy(file, "/lib/udev/", sizeof(file));
+                                       strlcat(file, value, sizeof(file));
+                                       pos = strchr(file, ' ');
+                                       if (pos)
+                                               pos[0] = '\0';
+                               }
+
                                dbg("IMPORT auto mode for '%s'", file);
                                if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
                                        dbg("IMPORT is executable, will be executed (autotype)");
@@ -406,12 +420,9 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                        rule->ignore_remove = 1;
                                }
                        }
-                       if (value[0] == '\0') {
-                               dbg("name empty device should be ignored");
-                               rule->name.operation = operation;
-                               rule->ignore_device = 1;
-                       } else
-                               add_rule_key(rule, &rule->name, operation, value);
+                       if (value[0] == '\0')
+                               dbg("name empty, node creation supressed");
+                       add_rule_key(rule, &rule->name, operation, value);
                        continue;
                }
 
@@ -430,7 +441,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                        char owner[32];
                                        uid_t uid = lookup_user(value);
                                        dbg("replacing username='%s' by id=%i", value, uid);
-                                       sprintf(owner, "%li", uid);
+                                       sprintf(owner, "%u", (unsigned int) uid);
                                        add_rule_key(rule, &rule->owner, operation, owner);
                                        continue;
                                }
@@ -449,7 +460,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                        char group[32];
                                        gid_t gid = lookup_group(value);
                                        dbg("replacing groupname='%s' by id=%i", value, gid);
-                                       sprintf(group, "%li", gid);
+                                       sprintf(group, "%u", (unsigned int) gid);
                                        add_rule_key(rule, &rule->group, operation, group);
                                        continue;
                                }
@@ -534,7 +545,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
        int retval = 0;
 
        if (file_map(filename, &buf, &bufsize) != 0) {
-               err("can't open '%s' as rules file", filename);
+               err("can't open '%s' as rules file: %s", filename, strerror(errno));
                return -1;
        }
        dbg("reading '%s' as rules file", filename);
@@ -584,40 +595,15 @@ static int parse_file(struct udev_rules *rules, const char *filename)
        return retval;
 }
 
-static int rules_map(struct udev_rules *rules, const char *filename)
-{
-       if (file_map(filename, &rules->buf, &rules->bufsize)) {
-               rules->buf = NULL;
-               return -1;
-       }
-       if (rules->bufsize == 0) {
-               file_unmap(rules->buf, rules->bufsize);
-               rules->buf = NULL;
-               return -1;
-       }
-       rules->mapped = 1;
-
-       return 0;
-}
-
 int udev_rules_init(struct udev_rules *rules, int resolve_names)
 {
-       char comp[PATH_SIZE];
        struct stat stats;
        int retval;
 
        memset(rules, 0x00, sizeof(struct udev_rules));
        rules->resolve_names = resolve_names;
 
-       /* check for precompiled rules */
-       strlcpy(comp, udev_rules_filename, sizeof(comp));
-       strlcat(comp, ".compiled", sizeof(comp));
-       if (stat(comp, &stats) == 0) {
-               dbg("map compiled rules '%s'", comp);
-               if (rules_map(rules, comp) == 0)
-                       return 0;
-       }
-
+       /* parse rules file or all matching files in directory */
        if (stat(udev_rules_filename, &stats) != 0)
                return -1;
 
@@ -632,20 +618,25 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
                retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
 
                list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
-                       parse_file(rules, name_loop->name);
+                       if (stat(name_loop->name, &stats) == 0) {
+                               if (stats.st_size)
+                                       parse_file(rules, name_loop->name);
+                               else
+                                       dbg("empty rules file '%s'", name_loop->name);
+                       } else
+                               err("could not read '%s': %s", name_loop->name, strerror(errno));
                        list_del(&name_loop->node);
+                       free(name_loop);
                }
        }
 
        return retval;
 }
 
-void udev_rules_close(struct udev_rules *rules)
+void udev_rules_cleanup(struct udev_rules *rules)
 {
-       if (rules->mapped)
-               file_unmap(rules->buf, rules->bufsize);
-       else
+       if (rules->buf) {
                free(rules->buf);
-
-       rules->buf = NULL;
+               rules->buf = NULL;
+       }
 }