[PATCH] cleanup namedev_parse debug text

[elogind.git] / namedev_parse.c

diff --git a/namedev_parse.c b/namedev_parse.c
index 5cb3a3eb1d3c04cedce3ac997361214534b487ec..02ffb0a3e70def31d4221dd8214b973eca07f799 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -36,6 +36,19 @@
 #include "udev.h"
 #include "namedev.h"
 
 #include "udev.h"
 #include "namedev.h"
 

+static int add_config_dev(struct config_device *new_dev)
+{
+       struct config_device *tmp_dev;
+
+       tmp_dev = malloc(sizeof(*tmp_dev));
+       if (tmp_dev == NULL)
+               return -ENOMEM;
+       memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
+       list_add_tail(&tmp_dev->node, &config_device_list);
+       //dump_config_dev(tmp_dev);
+       return 0;
+}
+

 int get_pair(char **orig_string, char **left, char **right)
 {
        char *temp;
 int get_pair(char **orig_string, char **left, char **right)
 {
        char *temp;


@@ -45,7 +58,7 @@ int get_pair(char **orig_string, char **left, char **right)
                return -ENODEV;
 
        /* eat any whitespace */
                return -ENODEV;
 
        /* eat any whitespace */

-       while (isspace(*string))
+       while (isspace(*string) || *string == ',')

                ++string;
 
        /* split based on '=' */
                ++string;
 
        /* split based on '=' */


@@ -71,19 +84,6 @@ int get_pair(char **orig_string, char **left, char **right)
        return 0;
 }
 
        return 0;
 }
 

-static int get_value(const char *left, char **orig_string, char **ret_string)
-{
-       int retval;
-       char *left_string;
-
-       retval = get_pair(orig_string, &left_string, ret_string);
-       if (retval)
-               return retval;
-       if (strcasecmp(left_string, left) != 0)
-               return -ENODEV;
-       return 0;
-}
-

 void dump_config_dev(struct config_device *dev)
 {
        switch (dev->type) {
 void dump_config_dev(struct config_device *dev)
 {
        switch (dev->type) {


@@ -91,8 +91,8 @@ void dump_config_dev(struct config_device *dev)
                dbg_parse("KERNEL name='%s'", dev->name);
                break;
        case LABEL:
                dbg_parse("KERNEL name='%s'", dev->name);
                break;
        case LABEL:

-               dbg_parse("LABEL name='%s', bus='%s', sysfs_file='%s', sysfs_value='%s'",
-                         dev->name, dev->bus, dev->sysfs_file, dev->sysfs_value);
+               dbg_parse("LABEL name='%s', bus='%s', sysfs_file[0]='%s', sysfs_value[0]='%s'",
+                         dev->name, dev->bus, dev->sysfs_pair[0].file, dev->sysfs_pair[0].value);

                break;
        case NUMBER:
                dbg_parse("NUMBER name='%s', bus='%s', id='%s'",
                break;
        case NUMBER:
                dbg_parse("NUMBER name='%s', bus='%s', id='%s'",


@@ -169,15 +169,14 @@ int namedev_init_rules(void)
                if (temp == NULL)
                        goto exit;
                lineno++;
                if (temp == NULL)
                        goto exit;
                lineno++;

-

                dbg_parse("read '%s'", temp);
 
                dbg_parse("read '%s'", temp);
 

-               /* eat the whitespace at the beginning of the line */
+               /* eat the whitespace */

                while (isspace(*temp))
                        ++temp;
 
                /* empty line? */
                while (isspace(*temp))
                        ++temp;
 
                /* empty line? */

-               if (*temp == 0x00)
+               if ((*temp == '\0') || (*temp == '\n'))

                        continue;
 
                /* see if this is a comment */
                        continue;
 
                /* see if this is a comment */


@@ -186,161 +185,166 @@ int namedev_init_rules(void)
 
                memset(&dev, 0x00, sizeof(struct config_device));
 
 
                memset(&dev, 0x00, sizeof(struct config_device));
 

-               /* parse the line */
+               /* get the method */

                temp2 = strsep(&temp, ",");
                temp2 = strsep(&temp, ",");

+

                if (strcasecmp(temp2, TYPE_LABEL) == 0) {
                if (strcasecmp(temp2, TYPE_LABEL) == 0) {

-                       /* label type */

                        dev.type = LABEL;
                        dev.type = LABEL;

-
-                       /* BUS="bus" */
-                       retval = get_value("BUS", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.bus, temp3);
-
-                       /* file="value" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_pair(&temp, &temp2, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.sysfs_file, temp2);
-                       strfieldcpy(dev.sysfs_value, temp3);
-
-                       /* NAME="new_name" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_value("NAME", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.name, temp3);
-
-                       dbg_parse("LABEL name='%s', bus='%s', "
-                                 "sysfs_file='%s', sysfs_value='%s'",
-                                 dev.name, dev.bus, dev.sysfs_file,
-                                 dev.sysfs_value);
+                       goto keys;

                }
 
                if (strcasecmp(temp2, TYPE_NUMBER) == 0) {
                }
 
                if (strcasecmp(temp2, TYPE_NUMBER) == 0) {

-                       /* number type */

                        dev.type = NUMBER;
                        dev.type = NUMBER;

-
-                       /* BUS="bus" */
-                       retval = get_value("BUS", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.bus, temp3);
-
-                       /* ID="id" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_value("ID", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.id, temp3);
-
-                       /* NAME="new_name" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_value("NAME", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.name, temp3);
-
-                       dbg_parse("NUMBER name='%s', bus='%s', id='%s'",
-                                 dev.name, dev.bus, dev.id);
+                       goto keys;

                }
 
                if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
                }
 
                if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {

-                       /* number type */

                        dev.type = TOPOLOGY;
                        dev.type = TOPOLOGY;

-
-                       /* BUS="bus" */
-                       retval = get_value("BUS", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.bus, temp3);
-
-                       /* PLACE="place" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_value("PLACE", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.place, temp3);
-
-                       /* NAME="new_name" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_value("NAME", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.name, temp3);
-
-                       dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s'",
-                                 dev.name, dev.bus, dev.place);
+                       goto keys;

                }
 
                if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
                }
 
                if (strcasecmp(temp2, TYPE_REPLACE) == 0) {

-                       /* number type */

                        dev.type = REPLACE;
                        dev.type = REPLACE;

-
-                       /* KERNEL="kernel_name" */
-                       retval = get_value("KERNEL", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.kernel_name, temp3);
-
-                       /* NAME="new_name" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_value("NAME", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.name, temp3);
-                       dbg_parse("REPLACE name='%s', kernel_name='%s'",
-                                 dev.name, dev.kernel_name);
+                       goto keys;

                }
                }

+

                if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
                if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {

-                       /* number type */

                        dev.type = CALLOUT;
                        dev.type = CALLOUT;

+                       goto keys;
+               }

 
 

-                       /* BUS="bus" */
-                       retval = get_value("BUS", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.bus, temp3);
-
-                       /* PROGRAM="executable" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_value("PROGRAM", &temp, &temp3);
+               dbg_parse("unknown type of method '%s'", temp2);
+               goto error;
+keys:
+               /* get all known keys */
+               while (1) {
+                       retval = get_pair(&temp, &temp2, &temp3);

                        if (retval)
                                break;
                        if (retval)
                                break;

-                       strfieldcpy(dev.exec_program, temp3);

 
 

-                       /* ID="id" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_value("ID", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.id, temp3);
+                       if (strcasecmp(temp2, FIELD_BUS) == 0) {
+                               strfieldcpy(dev.bus, temp3);
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_ID) == 0) {
+                               strfieldcpy(dev.id, temp3);
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_PLACE) == 0) {
+                               strfieldcpy(dev.place, temp3);
+                               continue;
+                       }
+
+                       if (strncasecmp(temp2, FIELD_SYSFS, sizeof(FIELD_SYSFS)-1) == 0) {
+                               struct sysfs_pair *pair = &dev.sysfs_pair[0];
+                               int sysfs_pair_num = 0;
+
+                               /* find first unused pair */
+                               while (pair->file[0] != '\0') {
+                                       ++sysfs_pair_num;
+                                       if (sysfs_pair_num >= MAX_SYSFS_PAIRS) {
+                                               pair = NULL;
+                                               break;
+                                       }
+                                       ++pair;
+                               }
+                               if (pair) {
+                                       /* remove prepended 'SYSFS_' */
+                                       strfieldcpy(pair->file, temp2 + sizeof(FIELD_SYSFS)-1);
+                                       strfieldcpy(pair->value, temp3);
+                               }
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
+                               strfieldcpy(dev.kernel_name, temp3);
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_PROGRAM) == 0) {
+                               strfieldcpy(dev.exec_program, temp3);
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_NAME) == 0) {
+                               strfieldcpy(dev.name, temp3);
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_SYMLINK) == 0) {
+                               strfieldcpy(dev.symlink, temp3);
+                               continue;
+                       }
+
+                       dbg_parse("unknown type of field '%s'", temp2);
+               }

 
 

-                       /* NAME="new_name" */
-                       temp2 = strsep(&temp, ",");
-                       retval = get_value("NAME", &temp, &temp3);
-                       if (retval)
-                               break;
-                       strfieldcpy(dev.name, temp3);
-                       dbg_parse("CALLOUT name='%s', program='%s'",
-                                 dev.name, dev.exec_program);
+               /* check presence of keys according to method type */
+               switch (dev.type) {
+               case LABEL:
+                       dbg_parse(TYPE_LABEL " name='%s', bus='%s', "
+                                 "sysfs_file[0]='%s', sysfs_value[0]='%s', symlink='%s'",
+                                 dev.name, dev.bus, dev.sysfs_pair[0].file,
+                                 dev.sysfs_pair[0].value, dev.symlink);
+                       if ((*dev.name == '\0') ||
+                           (*dev.sysfs_pair[0].file == '\0') ||
+                           (*dev.sysfs_pair[0].value == '\0'))
+                               goto error;
+                       break;
+               case NUMBER:
+                       dbg_parse(TYPE_NUMBER " name='%s', bus='%s', id='%s', symlink='%s'",
+                                 dev.name, dev.bus, dev.id, dev.symlink);
+                       if ((*dev.name == '\0') ||
+                           (*dev.bus == '\0') ||
+                           (*dev.id == '\0'))
+                               goto error;
+                       break;
+               case TOPOLOGY:
+                       dbg_parse(TYPE_TOPOLOGY " name='%s', bus='%s', "
+                                 "place='%s', symlink='%s'",
+                                 dev.name, dev.bus, dev.place, dev.symlink);
+                       if ((*dev.name == '\0') ||
+                           (*dev.bus == '\0') ||
+                           (*dev.place == '\0'))
+                               goto error;
+                       break;
+               case REPLACE:
+                       dbg_parse(TYPE_REPLACE " name='%s', kernel_name='%s', symlink='%s'",
+                                 dev.name, dev.kernel_name, dev.symlink);
+                       if ((*dev.name == '\0') ||
+                           (*dev.kernel_name == '\0'))
+                               goto error;
+                       break;
+               case CALLOUT:
+                       dbg_parse(TYPE_CALLOUT " name='%s', bus='%s', program='%s', "
+                                 "id='%s', symlink='%s'",
+                                 dev.name, dev.bus, dev.exec_program,
+                                 dev.id, dev.symlink);
+                       if ((*dev.name == '\0') ||
+                           (*dev.id == '\0') ||
+                           (*dev.exec_program == '\0'))
+                               goto error;
+                       break;
+               default:
+                       dbg_parse("unknown type of method");
+                       goto error;

                }
 
                retval = add_config_dev(&dev);
                if (retval) {
                        dbg("add_config_dev returned with error %d", retval);
                }
 
                retval = add_config_dev(&dev);
                if (retval) {
                        dbg("add_config_dev returned with error %d", retval);

-                       goto exit;
+                       continue;

                }
        }
                }
        }

-       dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_rules_filename,
-                 lineno, temp - line, temp);
+error:
+       dbg_parse("%s:%d:%Zd: field missing or parse error", udev_rules_filename,
+                 lineno, temp - line);

 exit:
        fclose(fd);
        return retval;
 exit:
        fclose(fd);
        return retval;

-}      
-
+}

 
 int namedev_init_permissions(void)
 {
 
 int namedev_init_permissions(void)
 {


@@ -372,7 +376,7 @@ int namedev_init_permissions(void)
                        ++temp;
 
                /* empty line? */
                        ++temp;
 
                /* empty line? */

-               if (*temp == 0x00)
+               if ((*temp == '\0') || (*temp == '\n'))

                        continue;
 
                /* see if this is a comment */
                        continue;
 
                /* see if this is a comment */


@@ -414,7 +418,7 @@ int namedev_init_permissions(void)
                          dev.mode);
                retval = add_perm_dev(&dev);
                if (retval) {
                          dev.mode);
                retval = add_perm_dev(&dev);
                if (retval) {

-                       dbg("add_config_dev returned with error %d", retval);
+                       dbg("add_perm_dev returned with error %d", retval);

                        goto exit;
                }
        }
                        goto exit;
                }
        }