libvolume_id: fat - check for signature at end of sector

[elogind.git] / udev_rules.c

diff --git a/udev_rules.c b/udev_rules.c
index 09a299f22458a6cde5f4e06fa0e5e6ad9afb2afb..ee4632513acd317a6f1d3e357005311d8864f2bf 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -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.
@@ -293,7 +293,7 @@ static int find_free_number(const char *base, const char *devpath)
        static int warn = 1;
 
        if (warn) {
-               err("%%e is deprecated, will be removed and is unlikey to work correctly. Don't use it.");
+               err("%%e is deprecated, will be removed and is unlikely to work correctly. Don't use it.");
                warn = 0;
        }
 
@@ -451,8 +451,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;
@@ -680,7 +679,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,6 +726,10 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
        if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
                goto nomatch;
 
+       /* compare NAME against a previously assigned value */
+       if (match_key("NAME", rule, &rule->name, udev->name))
+               goto nomatch;
+
        if (rule->modalias.operation != KEY_OP_UNSET) {
                const char *value;
                static int warn = 1;
@@ -748,7 +752,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
                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 +780,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 +902,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 +933,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 +1022,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;