chiark / gitweb /
rules: update Fedora
[elogind.git] / udev_rules_parse.c
index 5603ee1d11fa83a26578e09ed2a521dd9c7882fa..3afc31a0fad8b7cb35d4a11ea9dc74da61fc4f46 100644 (file)
@@ -1,8 +1,6 @@
 /*
- * udev_rules_parse.c
- *
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 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
@@ -15,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -106,12 +104,9 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
                        break;
                if (linepos[0] == '=')
                        break;
-               if (linepos[0] == '+')
-                       break;
-               if (linepos[0] == '!')
-                       break;
-               if (linepos[0] == ':')
-                       break;
+               if ((linepos[0] == '+') || (linepos[0] == '!') || (linepos[0] == ':'))
+                       if (linepos[1] == '=')
+                               break;
        }
 
        /* remember end of key */
@@ -237,23 +232,22 @@ static int add_rule_key_pair(struct udev_rule *rule, struct key_pairs *pairs,
 
 static int add_to_rules(struct udev_rules *rules, char *line, const char *filename, unsigned int lineno)
 {
+       char buf[sizeof(struct udev_rule) + LINE_SIZE];
        struct udev_rule *rule;
        size_t rule_size;
        int valid;
        char *linepos;
        char *attr;
        size_t padding;
+       int physdev = 0;
        int retval;
 
-       /* get all the keys */
-       rule = calloc(1, sizeof (struct udev_rule) + LINE_SIZE);
-       if (!rule) {
-               err("malloc failed");
-               return -1;
-       }
+       memset(buf, 0x00, sizeof(buf));
+       rule = (struct udev_rule *) buf;
        linepos = line;
        valid = 0;
 
+       /* get all the keys */
        while (1) {
                char *key;
                char *value;
@@ -302,7 +296,16 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                                err("invalid SUBSYSTEM operation");
                                goto invalid;
                        }
-                       add_rule_key(rule, &rule->subsystem, operation, value);
+                       /* bus, class, subsystem events should all be the same */
+                       if (strcmp(value, "subsystem") == 0 ||
+                           strcmp(value, "bus") == 0 ||
+                           strcmp(value, "class") == 0) {
+                               if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
+                                       err("'%s' must be specified as 'subsystem' "
+                                           "please fix it in %s:%u", value, filename, lineno);
+                               add_rule_key(rule, &rule->subsystem, operation, "subsystem|class|bus");
+                       } else
+                               add_rule_key(rule, &rule->subsystem, operation, value);
                        valid = 1;
                        continue;
                }
@@ -313,10 +316,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                                err("invalid DRIVER operation");
                                goto invalid;
                        }
-                       err("DRIVER== will change in a future relase, "
-                           "please use DRIVERS== in %s:%u", filename, lineno);
-                       /* FIXME: this should be rule->driver to match only the event device */
-                       add_rule_key(rule, &rule->drivers, operation, value);
+                       add_rule_key(rule, &rule->driver, operation, value);
                        valid = 1;
                        continue;
                }
@@ -370,11 +370,22 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 
                if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
                    strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid ATTRS operation");
+                               goto invalid;
+                       }
                        attr = get_key_attribute(key + sizeof("ATTRS")-1);
                        if (attr == NULL) {
                                err("error parsing ATTRS attribute");
                                goto invalid;
                        }
+                       if (strncmp(attr, "device/", 7) == 0)
+                               err("the 'device' link is deprecated and will be removed from a future kernel, "
+                                   "please fix it in %s:%u", filename, lineno);
+                       else if (strstr(attr, "../") != NULL)
+                               err("do not reference parent sysfs directories directly, that may break with a future kernel, "
+                                   "please fix it in %s:%u", filename, lineno);
                        if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
                                goto invalid;
                        valid = 1;
@@ -387,6 +398,8 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                                err("error parsing ENV attribute");
                                goto invalid;
                        }
+                       if (strncmp(attr, "PHYSDEV", 7) == 0)
+                               physdev = 1;
                        if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
                                goto invalid;
                        valid = 1;
@@ -412,20 +425,20 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 
                if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
                        attr = get_key_attribute(key + sizeof("IMPORT")-1);
-                       if (attr && strstr(attr, "program")) {
+                       if (attr != NULL && strstr(attr, "program")) {
                                dbg("IMPORT will be executed");
                                rule->import_type  = IMPORT_PROGRAM;
-                       } else if (attr && strstr(attr, "file")) {
+                       } else if (attr != NULL && strstr(attr, "file")) {
                                dbg("IMPORT will be included as file");
                                rule->import_type  = IMPORT_FILE;
-                       } else if (attr && strstr(attr, "parent")) {
+                       } else if (attr != NULL && strstr(attr, "parent")) {
                                dbg("IMPORT will include the parent values");
                                rule->import_type = IMPORT_PARENT;
                        } else {
                                /* figure it out if it is executable */
                                char file[PATH_SIZE];
                                char *pos;
-                               struct stat stats;
+                               struct stat statbuf;
 
                                strlcpy(file, value, sizeof(file));
                                pos = strchr(file, ' ');
@@ -442,7 +455,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                                }
 
                                dbg("IMPORT auto mode for '%s'", file);
-                               if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
+                               if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
                                        dbg("IMPORT is executable, will be executed (autotype)");
                                        rule->import_type  = IMPORT_PROGRAM;
                                } else {
@@ -455,7 +468,21 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                        continue;
                }
 
-               if (strcasecmp(key, "RUN") == 0) {
+               if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+                       attr = get_key_attribute(key + sizeof("TEST")-1);
+                       if (attr != NULL)
+                               rule->test_mode_mask = strtol(attr, NULL, 8);
+                       add_rule_key(rule, &rule->test, operation, value);
+                       valid = 1;
+                       continue;
+               }
+
+               if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
+                       attr = get_key_attribute(key + sizeof("RUN")-1);
+                       if (attr != NULL) {
+                               if (strstr(attr, "ignore_error"))
+                                       rule->run_ignore_error = 1;
+                       }
                        add_rule_key(rule, &rule->run, operation, value);
                        valid = 1;
                        continue;
@@ -498,7 +525,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                }
 
                if (strcasecmp(key, "SYMLINK") == 0) {
-                       add_rule_key(rule, &rule->symlink, operation, value);
+                       if (operation == KEY_OP_MATCH ||
+                           operation == KEY_OP_NOMATCH)
+                               add_rule_key(rule, &rule->symlink_match, operation, value);
+                       else
+                               add_rule_key(rule, &rule->symlink, operation, value);
                        valid = 1;
                        continue;
                }
@@ -549,6 +580,8 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                }
 
                if (strcasecmp(key, "OPTIONS") == 0) {
+                       const char *pos;
+
                        if (strstr(value, "last_rule") != NULL) {
                                dbg("last rule to be applied");
                                rule->last_rule = 1;
@@ -561,6 +594,19 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                                dbg("remove event should be ignored");
                                rule->ignore_remove = 1;
                        }
+                       pos = strstr(value, "link_priority=");
+                       if (pos != NULL) {
+                               rule->link_priority = atoi(&pos[strlen("link_priority=")]);
+                               dbg("link priority=%i", rule->link_priority);
+                       }
+                       pos = strstr(value, "string_escape=");
+                       if (pos != NULL) {
+                               pos = &pos[strlen("string_escape=")];
+                               if (strncmp(pos, "none", strlen("none")) == 0)
+                                       rule->string_escape = ESCAPE_NONE;
+                               else if (strncmp(pos, "replace", strlen("replace")) == 0)
+                                       rule->string_escape = ESCAPE_REPLACE;
+                       }
                        if (strstr(value, "all_partitions") != NULL) {
                                dbg("creation of partition nodes requested");
                                rule->partitions = DEFAULT_PARTITIONS_COUNT;
@@ -572,6 +618,10 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                err("unknown key '%s' in %s:%u", key, filename, lineno);
        }
 
+       if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET)
+               err("PHYSDEV* values are deprecated and will be removed from a future kernel, "
+                   "please fix it in %s:%u", filename, lineno);
+
        /* skip line if not any valid key was found */
        if (!valid)
                goto invalid;
@@ -592,11 +642,9 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
        memcpy(rules->buf + rules->bufsize, rule, rule_size);
        rules->bufsize += rule_size;
 exit:
-       free(rule);
        return 0;
 
 invalid:
-       free(rule);
        err("invalid rule '%s:%u'", filename, lineno);
        return -1;
 }
@@ -616,7 +664,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
                err("can't open '%s' as rules file: %s", filename, strerror(errno));
                return -1;
        }
-       dbg("reading '%s' as rules file", filename);
+       info("reading '%s' as rules file", filename);
 
        /* loop through the whole file */
        cur = 0;
@@ -665,37 +713,67 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 
 int udev_rules_init(struct udev_rules *rules, int resolve_names)
 {
-       struct stat stats;
-       int retval;
+       struct stat statbuf;
+       char filename[PATH_MAX];
+       LIST_HEAD(name_list);
+       LIST_HEAD(dyn_list);
+       struct name_entry *name_loop, *name_tmp;
+       struct name_entry *dyn_loop, *dyn_tmp;
+       int retval = 0;
 
        memset(rules, 0x00, sizeof(struct udev_rules));
        rules->resolve_names = resolve_names;
 
-       /* parse rules file or all matching files in directory */
-       if (stat(udev_rules_filename, &stats) != 0)
+       /* read main config from single file or all files in a directory */
+       if (stat(udev_rules_dir, &statbuf) != 0)
                return -1;
-
-       if ((stats.st_mode & S_IFMT) != S_IFDIR) {
-               dbg("parse single rules file '%s'", udev_rules_filename);
-               retval = parse_file(rules, udev_rules_filename);
+       if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
+               dbg("parse single rules file '%s'", udev_rules_dir);
+               name_list_add(&name_list, udev_rules_dir, 1);
        } else {
-               struct name_entry *name_loop, *name_tmp;
-               LIST_HEAD(name_list);
+               dbg("parse rules directory '%s'", udev_rules_dir);
+               retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX);
+       }
+
+       /* read dynamic rules directory */
+       strlcpy(filename, udev_root, sizeof(filename));
+       strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
+       if (stat(filename, &statbuf) != 0) {
+               create_path(filename);
+               mkdir(filename, 0755);
+       }
+       add_matching_files(&dyn_list, filename, RULESFILE_SUFFIX);
 
-               dbg("parse rules directory '%s'", udev_rules_filename);
-               retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
+       /* sort dynamic rules files by basename into list of files */
+       list_for_each_entry_safe(dyn_loop, dyn_tmp, &dyn_list, node) {
+               const char *dyn_base = strrchr(dyn_loop->name, '/');
+
+               if (dyn_base == NULL)
+                       continue;
 
                list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
-                       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);
+                       const char *name_base = strrchr(name_loop->name, '/');
+
+                       if (name_base == NULL)
+                               continue;
+
+                       if (strcmp(name_base, dyn_base) > 0)
+                               break;
                }
+               list_move_tail(&dyn_loop->node, &name_loop->node);
+       }
+
+       /* parse list of files */
+       list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+               if (stat(name_loop->name, &statbuf) == 0) {
+                       if (statbuf.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;
@@ -708,3 +786,4 @@ void udev_rules_cleanup(struct udev_rules *rules)
                rules->buf = NULL;
        }
 }
+