set errno = ENOSYS in inotify stub

[elogind.git] / udev / udev-event.c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 1c640cf37d32b40bd2b5fa6bd5375c32c2054070..27bb5eb79ac545e6f60fdc29bf2f83752f3e436e 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -319,7 +319,7 @@ found:
                                size = strlen(value);
                                while (size > 0 && isspace(value[--size]))
                                        value[size] = '\0';
-                               count = util_replace_chars(value, ALLOWED_CHARS_INPUT);
+                               count = udev_util_replace_chars(value, UDEV_ALLOWED_CHARS_INPUT);
                                if (count > 0)
                                        info(event->udev, "%i character(s) replaced\n" , count);
                                util_strlcat(string, value, maxsize);
@@ -394,13 +394,14 @@ found:
                        break;
                case SUBST_LINKS:
                        {
+                               size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
                                struct udev_list_entry *list_entry;
 
                                list_entry = udev_device_get_devlinks_list_entry(dev);
-                               util_strlcat(string, udev_list_entry_get_name(list_entry), maxsize);
+                               util_strlcat(string, &udev_list_entry_get_name(list_entry)[devlen], maxsize);
                                udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
                                        util_strlcat(string, " ", maxsize);
-                                       util_strlcat(string, udev_list_entry_get_name(list_entry), maxsize);
+                                       util_strlcat(string, &udev_list_entry_get_name(list_entry)[devlen], maxsize);
                                }
                        }
                        break;
@@ -585,8 +586,10 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 
                /* read current database entry */
                dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
-               if (dev_old != NULL)
-                       udev_device_load_info(dev_old);
+               if (dev_old != NULL) {
+                       udev_device_read_db(dev_old);
+                       udev_device_set_info_loaded(dev_old);
+               }
 
                /* update database, create node and symlinks */
                udev_device_update_db(dev);
@@ -642,7 +645,8 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
        /* remove device node */
        if (major(udev_device_get_devnum(dev)) != 0 && strcmp(udev_device_get_action(dev), "remove") == 0) {
                /* import database entry and delete it */
-               udev_device_load_info(dev);
+               udev_device_read_db(dev);
+               udev_device_set_info_loaded(dev);
                udev_device_delete_db(dev);
 
                if (udev_device_get_devnode(dev) == NULL) {