remove precompiled rules option

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 0259268c8faa36b0ce8e7327c844798d4d7c12e0..6e978d74b4f17a3c26c7132b8ff117d102af4947 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -1,12 +1,9 @@
 /*
  * udev_rules_parse.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
  *     Free Software Foundation version 2 of the License.
@@ -92,7 +89,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 */
@@ -100,7 +97,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')
@@ -123,6 +123,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] == '=') {
@@ -155,6 +157,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] == '"')
@@ -241,6 +245,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
        int valid;
        char *linepos;
        char *attr;
+       size_t padding;
        int retval;
 
        /* get all the keys */
@@ -432,7 +437,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;
                                }
@@ -451,7 +456,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;
                                }
@@ -506,6 +511,11 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 
        /* grow buffer and add rule */
        rule_size = sizeof(struct udev_rule) + rule->bufsize;
+       padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
+       dbg("add %zi padding bytes", padding);
+       rule_size += padding;
+       rule->bufsize += padding;
+
        rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
        if (!rules->buf) {
                err("realloc failed");
@@ -581,40 +591,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;
 
@@ -629,8 +614,15 @@ 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
+                               dbg("could not read '%s'", name_loop->name);
                        list_del(&name_loop->node);
+                       free(name_loop);
                }
        }
 
@@ -639,10 +631,8 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
 
 void udev_rules_close(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;
+       }
 }