X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-event.c;h=bc692392d2b128298f9e8b3ca7c8cbf98b564634;hb=b76ad2e537e8672ace442eb27439521c9b107b09;hp=1c640cf37d32b40bd2b5fa6bd5375c32c2054070;hpb=6e0cb78c9d59f976222ecd88c172b4cd9a5b7347;p=elogind.git

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 1c640cf37..bc692392d 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -231,8 +231,9 @@ found:
 			break;
 		case SUBST_DRIVER:
 			if (event->dev_parent != NULL) {
-				const char *driver = udev_device_get_driver(event->dev_parent);
+				const char *driver;
 
+				driver = udev_device_get_driver(event->dev_parent);
 				if (driver == NULL)
 					break;
 				util_strlcat(string, driver, maxsize);
@@ -319,7 +320,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 +395,16 @@ 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);
+				if (list_entry == NULL)
+					break;
+				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;
@@ -425,6 +429,8 @@ found:
 				if (list_entry == NULL)
 					break;
 				value = udev_list_entry_get_value(list_entry);
+				if (value == NULL)
+					break;
 				dbg(event->udev, "substitute env '%s=%s'\n", attr, value);
 				util_strlcat(string, value, maxsize);
 				break;
@@ -508,7 +514,7 @@ static int rename_netif(struct udev_event *event)
 
 		/* wait 30 seconds for our target to become available */
 		util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
-		util_strlcpy(ifr.ifr_newname, udev_device_get_devnode(dev), IFNAMSIZ);
+		util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ);
 		loop = 30 * 20;
 		while (loop--) {
 			err = ioctl(sk, SIOCSIFNAME, &ifr);
@@ -523,7 +529,7 @@ static int rename_netif(struct udev_event *event)
 				break;
 			}
 			dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
-			    udev_device_get_devnode(dev), (30 * 20) - loop);
+			    event->name, (30 * 20) - loop);
 			usleep(1000 * 1000 / 20);
 		}
 	}
@@ -585,8 +591,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 +650,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) {