volume_id: rename subdirectory

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 9041c383e0576c0874eb4c65c1486b118a53565a..6bb83ae12b9366a0837f649c4042f884500287e7 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -28,10 +28,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
 #include "udev_rules.h"
 
 
@@ -369,6 +366,16 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                pos = strchr(file, ' ');
                                if (pos)
                                        pos[0] = '\0';
+
+                               /* allow programs in /lib/udev called without the path */
+                               if (strchr(file, '/') == NULL) {
+                                       strlcpy(file, "/lib/udev/", sizeof(file));
+                                       strlcat(file, value, sizeof(file));
+                                       pos = strchr(file, ' ');
+                                       if (pos)
+                                               pos[0] = '\0';
+                               }
+
                                dbg("IMPORT auto mode for '%s'", file);
                                if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
                                        dbg("IMPORT is executable, will be executed (autotype)");
@@ -414,7 +421,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                }
                        }
                        if (value[0] == '\0')
-                               dbg("name empty, not creation supressed");
+                               dbg("name empty, node creation supressed");
                        add_rule_key(rule, &rule->name, operation, value);
                        continue;
                }
@@ -538,7 +545,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
        int retval = 0;
 
        if (file_map(filename, &buf, &bufsize) != 0) {
-               err("can't open '%s' as rules file", filename);
+               err("can't open '%s' as rules file: %s", filename, strerror(errno));
                return -1;
        }
        dbg("reading '%s' as rules file", filename);
@@ -617,7 +624,7 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
                                else
                                        dbg("empty rules file '%s'", name_loop->name);
                        } else
-                               dbg("could not read '%s'", name_loop->name);
+                               err("could not read '%s': %s", name_loop->name, strerror(errno));
                        list_del(&name_loop->node);
                        free(name_loop);
                }
@@ -626,7 +633,7 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
        return retval;
 }
 
-void udev_rules_close(struct udev_rules *rules)
+void udev_rules_cleanup(struct udev_rules *rules)
 {
        if (rules->buf) {
                free(rules->buf);