$links should be relative

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

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 36d36ac643f1bb7d7b35db79391f8fa5d24d3537..27bb5eb79ac545e6f60fdc29bf2f83752f3e436e 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -52,6 +52,7 @@ void udev_event_unref(struct udev_event *event)
        udev_list_cleanup_entries(event->udev, &event->run_list);
        free(event->tmp_node);
        free(event->program_result);
+       free(event->name);
        dbg(event->udev, "free event %p\n", event);
        free(event);
 }
@@ -290,16 +291,21 @@ found:
                                err(event->udev, "missing file parameter for attr\n");
                        else {
                                const char *val;
-                               char value[UTIL_NAME_SIZE] = "";
+                               char value[UTIL_NAME_SIZE];
                                size_t size;
 
+                               value[0] = '\0';
+                               /* read the value specified by [usb/]*/
                                util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
 
-                               val = udev_device_get_sysattr_value(event->dev, attr);
-                               if (val != NULL)
-                                       util_strlcpy(value, val, sizeof(value));
+                               /* try to read attribute of the current device */
+                               if (value[0] == '\0') {
+                                       val = udev_device_get_sysattr_value(event->dev, attr);
+                                       if (val != NULL)
+                                               util_strlcpy(value, val, sizeof(value));
+                               }
 
-                               /* try the current device, other matches may have selected */
+                               /* try to read the attribute of the parent device, other matches have selected */
                                if (value[0] == '\0' && event->dev_parent != NULL && event->dev_parent != event->dev) {
                                        val = udev_device_get_sysattr_value(event->dev_parent, attr);
                                        if (val != NULL)
@@ -313,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);
@@ -388,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_properties_list_entry(dev);
-                               util_strlcpy(string, udev_list_entry_get_name(list_entry), maxsize);
+                               list_entry = udev_device_get_devlinks_list_entry(dev);
+                               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;
@@ -558,15 +565,17 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                        goto exit;
                }
 
-               if (event->name_ignore) {
+               if (event->name != NULL && event->name[0] == '\0') {
                        info(event->udev, "device node creation supressed\n");
                        goto exit;
                }
 
-               if (event->name[0] == '\0') {
+               if (event->name == NULL) {
                        info(event->udev, "no node name set, will use kernel name '%s'\n",
                             udev_device_get_sysname(event->dev));
-                       util_strlcpy(event->name, udev_device_get_sysname(event->dev), sizeof(event->name));
+                       event->name = strdup(udev_device_get_sysname(event->dev));
+                       if (event->name == NULL)
+                               goto exit;
                }
 
                /* set device node name */
@@ -575,23 +584,22 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                util_strlcat(filename, event->name, sizeof(filename));
                udev_device_set_devnode(dev, filename);
 
-               /* read current database entry; cleanup, if it is known device */
+               /* read current database entry */
                dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
                if (dev_old != NULL) {
-                       if (udev_device_get_devnode(dev_old) != NULL) {
-                               info(event->udev, "device node '%s' already in database, updating\n",
-                                    udev_device_get_devnode(dev_old));
-                               udev_node_update_old_links(dev, dev_old, event->test);
-                       }
-                       udev_device_unref(dev_old);
+                       udev_device_read_db(dev_old);
+                       udev_device_set_info_loaded(dev_old);
                }
 
+               /* update database, create node and symlinks */
                udev_device_update_db(dev);
-
                err = udev_node_add(dev, event->mode, event->uid, event->gid, event->test);
-               if (err != 0)
-                       goto exit;
 
+               /* remove/update possible left-over symlinks from old database entry */
+               if (dev_old != NULL) {
+                       udev_node_update_old_links(dev, dev_old, event->test);
+                       udev_device_unref(dev_old);
+               }
                goto exit;
        }
 
@@ -604,10 +612,8 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                        info(event->udev, "device event will be ignored\n");
                        goto exit;
                }
-               if (event->name[0] == '\0') {
-                       info(event->udev, "device renaming supressed\n");
+               if (event->name == NULL)
                        goto exit;
-               }
 
                /* look if we want to change the name of the netif */
                if (strcmp(event->name, udev_device_get_sysname(dev)) != 0) {
@@ -640,8 +646,8 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
        if (major(udev_device_get_devnum(dev)) != 0 && strcmp(udev_device_get_action(dev), "remove") == 0) {
                /* import database entry and delete it */
                udev_device_read_db(dev);
-               if (!event->test)
-                       udev_device_delete_db(dev);
+               udev_device_set_info_loaded(dev);
+               udev_device_delete_db(dev);
 
                if (udev_device_get_devnode(dev) == NULL) {
                        char devnode[UTIL_PATH_SIZE];
@@ -700,6 +706,11 @@ int udev_event_execute_run(struct udev_event *event)
 
                        util_strlcpy(program, cmd, sizeof(program));
                        udev_event_apply_format(event, program, sizeof(program));
+                       if (event->trace)
+                               fprintf(stderr, "run  %s (%llu) '%s'\n",
+                                      udev_device_get_syspath(event->dev),
+                                      udev_device_get_seqnum(event->dev),
+                                      program);
                        envp = udev_device_get_properties_envp(event->dev);
                        if (util_run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
                                if (!udev_list_entry_get_flag(list_entry))