[PATCH] - format char for CALLOUT output

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 24b9bc01ac2258f24fb85c67fb1a8c2fce5844cd..cf9e92635e0bfc2805dbedac833a2bb4d8f60d66 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -39,6 +39,7 @@
 #include "udev_version.h"
 #include "namedev.h"
 #include "libsysfs/libsysfs.h"
+#include "klibc_fixups.h"
 
 #define TYPE_LABEL     "LABEL"
 #define TYPE_NUMBER    "NUMBER"
@@ -49,6 +50,19 @@
 
 static LIST_HEAD(config_device_list);
 
+/* s2 may end with '*' to match everything */
+static int strncmp_wildcard(char *s1, char *s2, int max)
+{
+       int len = strlen(s2);
+       if (len > max)
+               len = max;
+       if (s2[len-1] == '*')
+               len--;
+       else
+               len = max;
+       return strncmp(s1, s2, len);
+}
+
 static void dump_dev(struct config_device *dev)
 {
        switch (dev->type) {
@@ -82,9 +96,9 @@ static void dump_dev(struct config_device *dev)
                          dev->owner, dev->group, dev->mode);
                break;
        case CALLOUT:
-               dbg_parse("CALLOUT name='%s', program='%s', bus='%s', id='%s', "
+               dbg_parse("CALLOUT name='%s', bus='%s', program='%s', id='%s', "
                          "owner='%s', group='%s', mode=%#o",
-                         dev->name, dev->exec_program, dev->bus, dev->id,
+                         dev->name, dev->bus, dev->exec_program, dev->id,
                          dev->owner, dev->group, dev->mode);
                break;
        default:
@@ -108,16 +122,8 @@ static int add_dev(struct config_device *new_dev)
        /* update the values if we already have the device */
        list_for_each(tmp, &config_device_list) {
                struct config_device *dev = list_entry(tmp, struct config_device, node);
-               int len = strlen(new_dev->name);
-               if (new_dev->name[len-1] == '*') {
-                       len--;
-                       if (strncmp(dev->name, new_dev->name, len))
-                               continue;
-               } else {
-                       if (strcmp(dev->name, new_dev->name))
-                               continue;
-               }
-               /* the same, copy the new info into this structure */
+               if (strncmp_wildcard(dev->name, new_dev->name, sizeof(dev->name)))
+                       continue;
                copy_var(dev, new_dev, type);
                copy_var(dev, new_dev, mode);
                copy_string(dev, new_dev, bus);
@@ -270,8 +276,8 @@ static int namedev_init_config(void)
                        strfieldcpy(dev.name, temp3);
 
                        dbg_parse("LABEL name='%s', bus='%s', "
-                                 "sysfs_file='%s', sysfs_value='%s'", 
-                                 dev.name, dev.bus, dev.sysfs_file, 
+                                 "sysfs_file='%s', sysfs_value='%s'",
+                                 dev.name, dev.bus, dev.sysfs_file,
                                  dev.sysfs_value);
                }
 
@@ -416,7 +422,6 @@ static int namedev_init_permissions(void)
 
        /* loop through the whole file */
        while (1) {
-               /* get a line */
                temp = fgets(line, sizeof(line), fd);
                if (temp == NULL)
                        break;
@@ -521,7 +526,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
                                        break;
                        }
                        if (args[i]) {
-                               dbg("to many args - %d", i);
+                               dbg("too many args - %d", i);
                                args[i] = NULL;
                        }
                        retval = execve(args[0], args, main_envp);
@@ -572,20 +577,18 @@ static int exec_callout(struct config_device *dev, char *value, int len)
        return retval;
 }
 
-static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev)
+static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev, char *value, int len)
 {
        struct config_device *dev;
        struct list_head *tmp;
-       char value[ID_SIZE];
 
        list_for_each(tmp, &config_device_list) {
                dev = list_entry(tmp, struct config_device, node);
                if (dev->type != CALLOUT)
                        continue;
-
-               if (exec_callout(dev, value, sizeof(value)))
+               if (exec_callout(dev, value, len))
                        continue;
-               if (strncmp(value, dev->id, sizeof(value)) != 0)
+               if (strncmp_wildcard(value, dev->id, len) != 0)
                        continue;
                strfieldcpy(udev->name, dev->name);
                if (dev->mode != 0) {
@@ -784,17 +787,12 @@ static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *
        int len;
 
        strfieldcpy(udev->name, class_dev->name);
+       /* look for permissions */
        list_for_each(tmp, &config_device_list) {
                dev = list_entry(tmp, struct config_device, node);
                len = strlen(dev->name);
-               if (dev->name[len-1] == '*') {
-                       len--;
-                       if (strncmp(dev->name, class_dev->name, len))
-                               continue;
-               } else {
-                       if (strcmp(dev->name, class_dev->name))
-                               continue;
-               }
+               if (strncmp_wildcard(class_dev->name, dev->name, sizeof(dev->name)))
+                       continue;
                if (dev->mode != 0) {
                        dbg_parse("found permissions for '%s'", class_dev->name);
                        udev->mode = dev->mode;
@@ -810,6 +808,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
        struct sysfs_class_device *class_dev_parent = NULL;
        int retval = 0;
        char *temp = NULL;
+       char value[ID_SIZE];
 
        udev->mode = 0;
 
@@ -852,7 +851,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
        }
 
        /* rules are looked at in priority order */
-       retval = do_callout(class_dev, udev);
+       retval = do_callout(class_dev, udev, value, sizeof(value));
        if (retval == 0)
                goto found;
 
@@ -881,6 +880,7 @@ found:
                char *pos = strchr(udev->name, '%');
                char *dig;
                char name[NAME_SIZE];
+
                if (pos) {
                        strfieldcpy(name, pos+2);
                        *pos = 0x00;
@@ -889,14 +889,13 @@ found:
                                if (!sysfs_device)
                                        break;
                                strcat(udev->name, sysfs_device->bus_id);
-                               dbg("bus_id inserted: %s", 
-                                               sysfs_device->bus_id);
+                               dbg("substitute bus_id '%s'", sysfs_device->bus_id);
                                break;
                        case 'n':
                                dig = class_dev->name + strlen(class_dev->name);
                                while (isdigit(*(dig-1)))
                                        dig--;
-                               strcat(udev->name, dig);
+                               strcat(pos, dig);
                                dbg("substitute kernel number '%s'", dig);
                                break;
                        case 'm':
@@ -907,6 +906,10 @@ found:
                                sprintf(pos, "%u", udev->major);
                                dbg("substitute major number '%u'", udev->major);
                                break;
+                       case 'c':
+                               strcat(pos, value);
+                               dbg("substitute callout output '%s'", value);
+                               break;
                        default:
                                dbg("unknown substitution type '%%%c'", pos[1]);
                                break;
@@ -956,5 +959,3 @@ int namedev_init(void)
        dump_dev_list();
        return retval;
 }
-
-