X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-event.c;h=27bb5eb79ac545e6f60fdc29bf2f83752f3e436e;hp=02c5c99dc1b4b6cfc2b7b46497c3ac1bb2dbc435;hb=adea2cc22b8b3d645ce2bf5eeef7a08980cc750c;hpb=dc4c7e463df35776631150e4e18a4ba41749843c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 02c5c99dc..27bb5eb79 100644
--- 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_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;
@@ -583,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;
 	}
 
@@ -646,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];
@@ -706,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))