chiark / gitweb /
remove broken %e enumeration
[elogind.git] / udev_rules.c
index 09a299f22458a6cde5f4e06fa0e5e6ad9afb2afb..979b81d821b570b05cbc7a9f1d830ddebb0d02e3 100644 (file)
@@ -2,17 +2,17 @@
  * udev_rules.c
  *
  * Copyright (C) 2003 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
  *     Free Software Foundation version 2 of the License.
- * 
+ *
  *     This program is distributed in the hope that it will be useful, but
  *     WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *     General Public License for more details.
- * 
+ *
  *     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.
@@ -263,88 +263,6 @@ static int import_parent_into_env(struct udevice *udev, const char *filter)
        return rc;
 }
 
-static int match_name_and_get_number(const char *base, const char *devname)
-{
-       size_t baselen;
-       char *endptr;
-       int num;
-
-       baselen = strlen(base);
-       if (strncmp(base, devname, baselen) != 0)
-               return -1;
-       if (devname[baselen] == '\0')
-               return 0;
-       if (!isdigit(devname[baselen]))
-               return -1;
-       num = strtoul(&devname[baselen], &endptr, 10);
-       if (endptr[0] != '\0')
-               return -1;
-       return num;
-}
-
-/* finds the lowest positive device number such that <name>N isn't present in the udevdb
- * if <name> doesn't exist, 0 is returned, N otherwise */
-static int find_free_number(const char *base, const char *devpath)
-{
-       char db_devpath[PATH_SIZE];
-       char filename[PATH_SIZE];
-       struct udevice *udev_db;
-       int num = 0;
-       static int warn = 1;
-
-       if (warn) {
-               err("%%e is deprecated, will be removed and is unlikey to work correctly. Don't use it.");
-               warn = 0;
-       }
-
-       /* check if the device already owns a matching name */
-       udev_db = udev_device_init();
-       if (udev_db == NULL)
-               return -1;
-       if (udev_db_get_device(udev_db, devpath) == 0) {
-               struct name_entry *name_loop;
-               int devnum;
-
-               devnum = match_name_and_get_number(base, udev_db->name);
-               if (devnum >= 0) {
-                       num = devnum;
-                       dbg("device '%s', already has the node '%s' with num %u, use it", devpath, base, num);
-                       goto out;
-               }
-               list_for_each_entry(name_loop, &udev_db->symlink_list, node) {
-                       devnum = match_name_and_get_number(base, name_loop->name);
-                       if (devnum >= 0) {
-                               num = devnum;
-                               dbg("device '%s', already has a symlink '%s' with num %u, use it", devpath, base, num);
-                               goto out;
-                       }
-               }
-       }
-
-       /* just search the database again and again until a free name is found */
-       strlcpy(filename, base, sizeof(filename));
-       while (1) {
-               dbg("look for existing node '%s'", filename);
-               if (udev_db_lookup_name(filename, db_devpath, sizeof(db_devpath)) != 0) {
-                       dbg("free num=%d", num);
-                       break;
-               }
-
-               num++;
-               if (num > 100000) {
-                       err("find_free_number aborted at num=%d", num);
-                       num = -1;
-                       break;
-               }
-               snprintf(filename, sizeof(filename), "%s%d", base, num);
-               filename[sizeof(filename)-1] = '\0';
-       }
-
-out:
-       udev_device_cleanup(udev_db);
-       return num;
-}
-
 #define WAIT_LOOP_PER_SECOND           50
 static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
 {
@@ -386,7 +304,6 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
        int len;
        int i;
        int count;
-       unsigned int next_free_number;
        enum subst_type {
                SUBST_UNKNOWN,
                SUBST_DEVPATH,
@@ -397,11 +314,9 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
                SUBST_MINOR,
                SUBST_RESULT,
                SUBST_SYSFS,
-               SUBST_ENUM,
                SUBST_PARENT,
                SUBST_TEMP_NODE,
                SUBST_ROOT,
-               SUBST_MODALIAS,
                SUBST_ENV,
        };
        static const struct subst_map {
@@ -417,11 +332,9 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
                { .name = "minor",              .fmt = 'm',     .type = SUBST_MINOR },
                { .name = "result",             .fmt = 'c',     .type = SUBST_RESULT },
                { .name = "sysfs",              .fmt = 's',     .type = SUBST_SYSFS },
-               { .name = "enum",               .fmt = 'e',     .type = SUBST_ENUM },
                { .name = "parent",             .fmt = 'P',     .type = SUBST_PARENT },
                { .name = "tempnode",           .fmt = 'N',     .type = SUBST_TEMP_NODE },
                { .name = "root",               .fmt = 'r',     .type = SUBST_ROOT },
-               { .name = "modalias",           .fmt = 'A',     .type = SUBST_MODALIAS },
                { .name = "env",                .fmt = 'E',     .type = SUBST_ENV },
                { NULL, '\0', 0 }
        };
@@ -451,8 +364,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
                                                goto found;
                                        }
                                }
-                       }
-                       else if (head[0] == '%') {
+                       } else if (head[0] == '%') {
                                /* substitute format char */
                                if (head[1] == '\0')
                                        break;
@@ -575,13 +487,6 @@ found:
                                dbg("substitute sysfs value '%s'", temp2);
                        }
                        break;
-               case SUBST_ENUM:
-                       next_free_number = find_free_number(string, udev->dev->devpath);
-                       if (next_free_number > 0) {
-                               sprintf(temp2, "%d", next_free_number);
-                               strlcat(string, temp2, maxsize);
-                       }
-                       break;
                case SUBST_PARENT:
                        {
                                struct sysfs_device *dev_parent;
@@ -619,24 +524,6 @@ found:
                        strlcat(string, udev_root, maxsize);
                        dbg("substitute udev_root '%s'", udev_root);
                        break;
-               case SUBST_MODALIAS:
-                       {
-                               const char *value;
-                               static int warn = 1;
-
-                               if (warn) {
-                                       err("$modalias is deprecated, use $env{MODALIAS} or "
-                                           "$sysfs{modalias} instead.");
-                                       warn = 0;
-                               }
-
-                               value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
-                               if (value != NULL) {
-                                       strlcat(string, value, maxsize);
-                                       dbg("substitute MODALIAS '%s'", temp2);
-                               }
-                       }
-                       break;
                case SUBST_ENV:
                        if (attr == NULL) {
                                dbg("missing attribute");
@@ -680,7 +567,8 @@ static int match_key(const char *key_name, struct udev_rule *rule, struct key *k
        char *key_value;
        char *pos;
 
-       if (key->operation == KEY_OP_UNSET)
+       if (key->operation != KEY_OP_MATCH &&
+           key->operation != KEY_OP_NOMATCH)
                return 0;
 
        strlcpy(value, rule->buf + key->val_off, sizeof(value));
@@ -726,29 +614,16 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
        if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
                goto nomatch;
 
-       if (rule->modalias.operation != KEY_OP_UNSET) {
-               const char *value;
-               static int warn = 1;
-
-               if (warn) {
-                       err("MODALIAS is deprecated, use ENV{MODALIAS} or SYSFS{modalias} instead.");
-                       warn = 0;
-               }
-
-               value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
-               if (value == NULL) {
-                       dbg("MODALIAS value not found");
-                       goto nomatch;
-               }
-               if (match_key("MODALIAS", rule, &rule->modalias, value))
-                       goto nomatch;
-       }
+       /* compare NAME against a previously assigned value */
+       if (match_key("NAME", rule, &rule->name, udev->name))
+               goto nomatch;
 
        for (i = 0; i < rule->env.count; i++) {
                struct key_pair *pair = &rule->env.keys[i];
 
                /* we only check for matches, assignments will be handled later */
-               if (pair->key.operation != KEY_OP_ASSIGN) {
+               if (pair->key.operation == KEY_OP_MATCH ||
+                   pair->key.operation == KEY_OP_NOMATCH) {
                        const char *key_name = key_pair_name(rule, pair);
                        const char *value = getenv(key_name);
 
@@ -775,22 +650,16 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
        udev->dev_parent = udev->dev;
        while (1) {
                /* check for matching driver */
-               if (rule->driver.operation != KEY_OP_UNSET) {
-                       if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
-                               goto try_parent;
-               }
+               if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
+                       goto try_parent;
 
                /* check for matching subsystem/bus value */
-               if (rule->bus.operation != KEY_OP_UNSET) {
-                       if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
-                               goto try_parent;
-               }
+               if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
+                       goto try_parent;
 
                /* check for matching bus id (device name) */
-               if (rule->id.operation != KEY_OP_UNSET) {
-                       if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
-                               goto try_parent;
-               }
+               if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
+                       goto try_parent;
 
                /* check for matching sysfs pairs */
                if (rule->sysfs.count) {
@@ -903,10 +772,13 @@ try_parent:
                if (pair->key.operation == KEY_OP_ASSIGN) {
                        const char *key_name = key_pair_name(rule, pair);
                        const char *value = key_val(rule, &pair->key);
+                       char *key_value = name_list_key_add(&udev->env_list, key_name, value);
+                       if (key_value == NULL)
+                               break;
 
-                       name_list_key_add(&udev->env_list, key_name, value);
-                       setenv(key_name, value, 1);
-                       dbg("export ENV '%s=%s'", key_name, value);
+                       udev_rules_apply_format(udev, key_value, NAME_SIZE);
+                       putenv(key_value);
+                       dbg("export ENV '%s'", key_value);
                }
        }
 
@@ -931,7 +803,10 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                if (rule == NULL)
                        break;
 
-               if (name_set && rule->name.operation != KEY_OP_UNSET) {
+               if (name_set &&
+                   (rule->name.operation == KEY_OP_ASSIGN ||
+                    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+                    rule->name.operation == KEY_OP_ADD)) {
                        dbg("node name already set, rule ignored");
                        continue;
                }
@@ -1017,7 +892,9 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                        }
 
                        /* set name, later rules with name set will be ignored */
-                       if (rule->name.operation != KEY_OP_UNSET) {
+                       if (rule->name.operation == KEY_OP_ASSIGN ||
+                           rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+                           rule->name.operation == KEY_OP_ADD) {
                                int count;
 
                                name_set = 1;