[PATCH] update udev.rules.gentoo with new config file format.

[elogind.git] / namedev_parse.c

diff --git a/namedev_parse.c b/namedev_parse.c
index 546d767aed6a665f55cd9156adac6a6f3cc035d8..d5d2181cb68bb427ba34c84f187aff12187e0202 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -3,7 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -52,41 +52,6 @@ static int add_config_dev(struct config_device *new_dev)
        return 0;
 }
 
-int get_pair(char **orig_string, char **left, char **right)
-{
-       char *temp;
-       char *string = *orig_string;
-
-       if (!string)
-               return -ENODEV;
-
-       /* eat any whitespace */
-       while (isspace(*string) || *string == ',')
-               ++string;
-
-       /* split based on '=' */
-       temp = strsep(&string, "=");
-       *left = temp;
-       if (!string)
-               return -ENODEV;
-
-       /* take the right side and strip off the '"' */
-       while (isspace(*string))
-               ++string;
-       if (*string == '"')
-               ++string;
-       else
-               return -ENODEV;
-
-       temp = strsep(&string, "\"");
-       if (!string || *temp == '\0')
-               return -ENODEV;
-       *right = temp;
-       *orig_string = string;
-       
-       return 0;
-}
-
 void dump_config_dev(struct config_device *dev)
 {
        /*FIXME dump all sysfs's */
@@ -120,6 +85,34 @@ void dump_perm_dev_list(void)
                dump_perm_dev(dev);
 }
 
+/* extract possible KEY{attr} or KEY_attr */
+static char *get_key_attribute(char *str)
+{
+       char *pos;
+       char *attr;
+
+       attr = strchr(str, '{');
+       if (attr != NULL) {
+               attr++;
+               pos = strchr(attr, '}');
+               if (pos == NULL) {
+                       dbg("missing closing brace for format");
+                       return NULL;
+               }
+               pos[0] = '\0';
+               dbg("attribute='%s'", attr);
+               return attr;
+       }
+
+       attr = strchr(str, '_');
+       if (attr != NULL) {
+               attr++;
+               dbg("attribute='%s'", attr);
+               return attr;
+       }
+
+       return NULL;
+}
 
 int namedev_init_rules(void)
 {
@@ -128,6 +121,7 @@ int namedev_init_rules(void)
        char *temp;
        char *temp2;
        char *temp3;
+       char *attr;
        FILE *fd;
        int program_given = 0;
        int retval = 0;
@@ -167,7 +161,7 @@ int namedev_init_rules(void)
 
                /* get all known keys */
                while (1) {
-                       retval = get_pair(&temp, &temp2, &temp3);
+                       retval = parse_get_pair(&temp, &temp2, &temp3);
                        if (retval)
                                break;
 
@@ -200,8 +194,12 @@ int namedev_init_rules(void)
                                        ++pair;
                                }
                                if (pair) {
-                                       /* remove prepended 'SYSFS_' */
-                                       strfieldcpy(pair->file, temp2 + sizeof(FIELD_SYSFS)-1);
+                                       attr = get_key_attribute(temp2 + sizeof(FIELD_SYSFS)-1);
+                                       if (attr == NULL) {
+                                               dbg("error parsing " FIELD_SYSFS " attribute");
+                                               continue;
+                                       }
+                                       strfieldcpy(pair->file, attr);
                                        strfieldcpy(pair->value, temp3);
                                }
                                continue;
@@ -223,7 +221,13 @@ int namedev_init_rules(void)
                                continue;
                        }
 
-                       if (strcasecmp(temp2, FIELD_NAME) == 0) {
+                       if (strncasecmp(temp2, FIELD_NAME, sizeof(FIELD_NAME)-1) == 0) {
+                               attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1);
+                               if (attr != NULL)
+                                       if (strcasecmp(attr, ATTR_PARTITIONS) == 0) {
+                                               dbg_parse("creation of partition nodes requested");
+                                               dev.partitions = PARTITIONS_COUNT;
+                                       }
                                strfieldcpy(dev.name, temp3);
                                continue;
                        }
@@ -241,12 +245,13 @@ int namedev_init_rules(void)
                /* simple plausibility check for given keys */
                if ((dev.sysfs_pair[0].file[0] == '\0') ^
                    (dev.sysfs_pair[0].value[0] == '\0')) {
-                       dbg("inconsistency in SYSFS_ key");
+                       dbg("inconsistency in " FIELD_SYSFS " key");
                        goto error;
                }
 
                if ((dev.result[0] != '\0') && (program_given == 0)) {
-                       dbg("RESULT is only useful when PROGRAM called in any rule before");
+                       dbg(FIELD_RESULT " is only useful when "
+                           FIELD_PROGRAM " is called in any rule before");
                        goto error;
                }
 
@@ -345,6 +350,5 @@ int namedev_init_permissions(void)
 exit:
        fclose(fd);
        return retval;
-}      
-
+}