added cdrom_id to the build check

[elogind.git] / udev_rules.c

diff --git a/udev_rules.c b/udev_rules.c
index 6a485f08afaa00bf5eabf1701726ecc510c68609..40c010c63f97447d24dfd1bb065bf4c9a17c8781 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -27,6 +27,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <errno.h>
+#include <syslog.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
@@ -187,7 +188,8 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
-               strlcpy(line, bufline, count+1);
+               memcpy(line, bufline, count);
+               line[count] = '\0';
 
                linepos = line;
                if (get_key(&linepos, &variable, &value) == 0) {
@@ -220,7 +222,7 @@ static int import_program_into_env(struct udevice *udev, const char *program)
        char result[1024];
        size_t reslen;
 
-       if (execute_program(program, udev->subsystem, result, sizeof(result), &reslen) != 0)
+       if (run_program(program, udev->subsystem, result, sizeof(result), &reslen, (udev_log_priority >= LOG_DEBUG)) != 0)
                return -1;
        return import_keys_into_env(udev, result, reslen);
 }
@@ -295,6 +297,7 @@ static int find_free_number(struct udevice *udev, const char *name)
 static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device,
                                const char *name, char *value, size_t len)
 {
+       struct sysfs_class_device *class_dev_parent;
        struct sysfs_attribute *tmpattr;
 
        dbg("look for device attribute '%s'", name);
@@ -303,6 +306,12 @@ static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sys
                tmpattr = sysfs_get_classdev_attr(class_dev, name);
                if (tmpattr)
                        goto attr_found;
+               class_dev_parent = sysfs_get_classdev_parent(class_dev);
+               if (class_dev_parent) {
+                       tmpattr = sysfs_get_classdev_attr(class_dev_parent, name);
+                       if (tmpattr)
+                               goto attr_found;
+               }
        }
        if (sysfs_device) {
                dbg("look for devices attribute '%s/%s'", sysfs_device->path, name);
@@ -799,7 +808,7 @@ try_parent:
                apply_format(udev, import, sizeof(import), class_dev, sysfs_device);
                dbg("check for IMPORT import='%s'", import);
                if (rule->import_type == IMPORT_PROGRAM) {
-                       dbg("run executable file import='%s'", import);
+                       info("IMPORT executes '%s'", import);
                        rc = import_program_into_env(udev, import);
                } else if (rule->import_type == IMPORT_FILE) {
                        dbg("import file import='%s'", import);
@@ -824,9 +833,10 @@ try_parent:
 
                strlcpy(program, key_val(rule, &rule->program), sizeof(program));
                apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
-               dbg("check for PROGRAM program='%s", program);
-               if (execute_program(program, udev->subsystem, result, sizeof(result), NULL) != 0) {
+               info("PROGRAM key executes '%s", program);
+               if (run_program(program, udev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_DEBUG)) != 0) {
                        dbg("PROGRAM is false");
+                       udev->program_result[0] = '\0';
                        if (rule->program.operation != KEY_OP_NOMATCH)
                                goto exit;
                } else {
@@ -1023,7 +1033,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct s
 
        if (!name_set) {
                strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
-               info("no rule found, will use kernel name '%s'", udev->name);
+               info("no node name set, will use kernel name '%s'", udev->name);
        }
 
        if (udev->tmp_node[0] != '\0') {