events for "bus" and "class" registration must be matched as "subsystem"

[elogind.git] / udev_rules.c

diff --git a/udev_rules.c b/udev_rules.c
index edfe3fd94cb0102e8701c6f05cba23da7da70d07..1139c99a7d0e84ff3b8e289a3c6af251d5aabf76 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -87,54 +87,29 @@ static int get_key(char **line, char **key, char **value)
                linepos++;
 
        /* get the key */
+       temp = strchr(linepos, '=');
+       if (temp == NULL || temp == linepos)
+               return -1;
+       temp[0] = '\0';
        *key = linepos;
-       while (1) {
-               linepos++;
-               if (linepos[0] == '\0')
-                       return -1;
-               if (isspace(linepos[0]))
-                       break;
-               if (linepos[0] == '=')
-                       break;
+       linepos = &temp[1];
+
+       /* get a quoted value */
+       if (linepos[0] == '"' || linepos[0] == '\'') {
+               temp = strchr(&linepos[1], linepos[0]);
+               if (temp != NULL) {
+                       temp[0] = '\0';
+                       *value = &linepos[1];
+                       goto out;
+               }
        }
 
-       /* terminate key */
-       linepos[0] = '\0';
-       linepos++;
-
-       /* skip whitespace */
-       while (isspace(linepos[0]))
-               linepos++;
-
        /* get the value*/
-       if (linepos[0] == '"') {
-               linepos++;
-               temp = strchr(linepos, '"');
-               if (!temp) {
-                       dbg("missing closing quote");
-                       return -1;
-               }
-               dbg("value is quoted");
+       temp = strchr(linepos, '\n');
+       if (temp != NULL)
                temp[0] = '\0';
-       } else if (linepos[0] == '\'') {
-               linepos++;
-               temp = strchr(linepos, '\'');
-               if (!temp) {
-                       dbg("missing closing quote");
-                       return -1;
-               }
-               dbg("value is quoted");
-               temp[0] = '\0';
-       } else if (linepos[0] == '\0') {
-               dbg("value is empty");
-       } else {
-               temp = linepos;
-               while (temp[0] && !isspace(temp[0]))
-                       temp++;
-               temp[0] = '\0';
-       }
        *value = linepos;
-
+out:
        return 0;
 }
 
@@ -491,15 +466,15 @@ found:
                                if (value == NULL)
                                        break;
 
-                               /* strip trailing whitespace and replace untrusted characters of sysfs value */
+                               /* strip trailing whitespace, and replace unwanted characters */
                                size = strlcpy(temp2, value, sizeof(temp2));
                                if (size >= sizeof(temp2))
                                        size = sizeof(temp2)-1;
                                while (size > 0 && isspace(temp2[size-1]))
                                        temp2[--size] = '\0';
-                               count = replace_untrusted_chars(temp2);
+                               count = replace_chars(temp2, ALLOWED_CHARS_INPUT);
                                if (count > 0)
-                                       info("%i untrusted character(s) replaced" , count);
+                                       info("%i character(s) replaced" , count);
                                strlcat(string, temp2, maxsize);
                                dbg("substitute sysfs value '%s'", temp2);
                        }
@@ -776,9 +751,9 @@ try_parent:
 
                        dbg("PROGRAM matches");
                        remove_trailing_chars(result, '\n');
-                       count = replace_untrusted_chars(result);
+                       count = replace_chars(result, ALLOWED_CHARS_INPUT);
                        if (count)
-                               info("%i untrusted character(s) replaced" , count);
+                               info("%i character(s) replaced" , count);
                        dbg("result is '%s'", result);
                        strlcpy(udev->program_result, result, sizeof(udev->program_result));
                        dbg("PROGRAM returned successful");
@@ -959,14 +934,13 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                                        info("reset symlink list");
                                        name_list_cleanup(&udev->symlink_list);
                                }
+                               /* allow  multiple symlinks separated by spaces */
                                strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
                                udev_rules_apply_format(udev, temp, sizeof(temp));
-                               count = replace_untrusted_chars(temp);
+                               count = replace_chars(temp, ALLOWED_CHARS_FILE " ");
                                if (count)
-                                       info("%i untrusted character(s) replaced" , count);
+                                       info("%i character(s) replaced" , count);
                                dbg("rule applied, added symlink(s) '%s'", temp);
-
-                               /* add multiple symlinks separated by spaces */
                                pos = temp;
                                while (isspace(pos[0]))
                                        pos++;
@@ -995,9 +969,9 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                                name_set = 1;
                                strlcpy(udev->name, key_val(rule, &rule->name), sizeof(udev->name));
                                udev_rules_apply_format(udev, udev->name, sizeof(udev->name));
-                               count = replace_untrusted_chars(udev->name);
+                               count = replace_chars(udev->name, ALLOWED_CHARS_FILE);
                                if (count)
-                                       info("%i untrusted character(s) replaced", count);
+                                       info("%i character(s) replaced", count);
 
                                info("rule applied, '%s' becomes '%s'", udev->dev->kernel, udev->name);
                                if (strcmp(udev->dev->subsystem, "net") != 0)