X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-event.c;h=a6459eb8d931e4f071b70c96342963f3f28c07f4;hb=4052400fa05d09a12ee89003ce1a74109bb814c3;hp=36d36ac643f1bb7d7b35db79391f8fa5d24d3537;hpb=40fd3bc837e04538df305b512157e55a2a5e0789;p=elogind.git

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 36d36ac64..a6459eb8d 100644
--- 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)
@@ -558,15 +564,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 */
@@ -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) {
@@ -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))