X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-device.c;h=65ba6e30d83ef736389d413578e6877473a5e9bb;hb=8460299b572eb13e7b97a0956b59c053f9009afa;hp=2f685bd8e893849d1b93c48f1c5e16476d41ff23;hpb=517814e7d07fb7a2a4f914c973a8164d4341c6c4;p=elogind.git

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 2f685bd8e..65ba6e30d 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -35,21 +35,27 @@ struct udev_device {
 	int refcount;
 	struct udev *udev;
 	struct udev_device *parent_device;
+	int parent_set;
 	char *syspath;
 	const char *devpath;
 	char *sysname;
 	const char *sysnum;
 	char *devnode;
 	char *subsystem;
+	int subsystem_set;
 	struct udev_list_node devlinks_list;
+	int devlinks_uptodate;
 	struct udev_list_node properties_list;
+	char *envp[128];
+	int envp_uptodate;
+	char *driver;
+	int driver_set;
+	dev_t devnum;
 	char *action;
 	int event_timeout;
-	char *driver;
 	char *devpath_old;
 	char *physdevpath;
 	int timeout;
-	dev_t devnum;
 	unsigned long long int seqnum;
 	int num_fake_partitions;
 	int devlink_priority;
@@ -69,7 +75,7 @@ static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *f
 	return util_path_encode(&filename[start], len - start);
 }
 
-static int device_read_db(struct udev_device *udev_device)
+int udev_device_read_db(struct udev_device *udev_device)
 {
 	struct stat stats;
 	char filename[UTIL_PATH_SIZE];
@@ -174,7 +180,7 @@ static int device_read_db(struct udev_device *udev_device)
 	return 0;
 }
 
-static int device_read_uevent_file(struct udev_device *udev_device)
+int udev_device_read_uevent_file(struct udev_device *udev_device)
 {
 	char filename[UTIL_PATH_SIZE];
 	FILE *f;
@@ -213,8 +219,8 @@ static int device_read_uevent_file(struct udev_device *udev_device)
 static void device_load_info(struct udev_device *device)
 {
 	device->info_loaded = 1;
-	device_read_uevent_file(device);
-	device_read_db(device);
+	udev_device_read_uevent_file(device);
+	udev_device_read_db(device);
 }
 
 void udev_device_set_info_loaded(struct udev_device *device)
@@ -225,6 +231,7 @@ void udev_device_set_info_loaded(struct udev_device *device)
 struct udev_device *device_new(struct udev *udev)
 {
 	struct udev_device *udev_device;
+	struct udev_list_entry *list_entry;
 
 	if (udev == NULL)
 		return NULL;
@@ -238,6 +245,12 @@ struct udev_device *device_new(struct udev *udev)
 	udev_list_init(&udev_device->devlinks_list);
 	udev_list_init(&udev_device->properties_list);
 	udev_list_init(&udev_device->attr_list);
+	udev_device->event_timeout = -1;
+	/* copy global properties */
+	udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
+		udev_device_add_property(udev_device,
+					 udev_list_entry_get_name(list_entry),
+					 udev_list_entry_get_value(list_entry));
 	info(udev_device->udev, "udev_device: %p created\n", udev_device);
 	return udev_device;
 }
@@ -512,12 +525,12 @@ struct udev_device *udev_device_get_parent(struct udev_device *udev_device)
 {
 	if (udev_device == NULL)
 		return NULL;
-
-	if (udev_device->parent_device != NULL) {
-		info(udev_device->udev, "returning existing parent %p\n", udev_device->parent_device);
-		return udev_device->parent_device;
+	if (!udev_device->parent_set) {
+		udev_device->parent_set = 1;
+		udev_device->parent_device = device_new_from_parent(udev_device);
 	}
-	udev_device->parent_device = device_new_from_parent(udev_device);
+	if (udev_device->parent_device != NULL)
+		info(udev_device->udev, "returning existing parent %p\n", udev_device->parent_device);
 	return udev_device->parent_device;
 }
 
@@ -578,6 +591,8 @@ struct udev_device *udev_device_ref(struct udev_device *udev_device)
  **/
 void udev_device_unref(struct udev_device *udev_device)
 {
+	unsigned int i;
+
 	if (udev_device == NULL)
 		return;
 	udev_device->refcount--;
@@ -596,6 +611,8 @@ void udev_device_unref(struct udev_device *udev_device)
 	free(udev_device->devpath_old);
 	free(udev_device->physdevpath);
 	udev_list_cleanup(udev_device->udev, &udev_device->attr_list);
+	for (i = 0; i < ARRAY_SIZE(udev_device->envp) && udev_device->envp[i] != NULL; i++)
+		free(udev_device->envp[i]);
 	info(udev_device->udev, "udev_device: %p released\n", udev_device);
 	free(udev_device);
 }
@@ -679,31 +696,30 @@ const char *udev_device_get_subsystem(struct udev_device *udev_device)
 
 	if (udev_device == NULL)
 		return NULL;
-	if (udev_device->subsystem != NULL)
-		return udev_device->subsystem;
-
-	/* read "subsytem" link */
-	if (util_get_sys_subsystem(udev_device->udev, udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
-		udev_device->subsystem = strdup(subsystem);
-		return udev_device->subsystem;
-	}
-
-	/* implicit names */
-	if (strncmp(udev_device->devpath, "/module/", 8) == 0) {
-		udev_device->subsystem = strdup("module");
-		return udev_device->subsystem;
-	}
-	if (strstr(udev_device->devpath, "/drivers/") != NULL) {
-		udev_device->subsystem = strdup("drivers");
-		return udev_device->subsystem;
-	}
-	if (strncmp(udev_device->devpath, "/subsystem/", 11) == 0 ||
-	    strncmp(udev_device->devpath, "/class/", 7) == 0 ||
-	    strncmp(udev_device->devpath, "/bus/", 5) == 0) {
-		udev_device->subsystem = strdup("subsystem");
-		return udev_device->subsystem;
+	if (!udev_device->subsystem_set) {
+		udev_device->subsystem_set = 1;
+		/* read "subsytem" link */
+		if (util_get_sys_subsystem(udev_device->udev, udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
+			udev_device_set_subsystem(udev_device, subsystem);
+			return udev_device->subsystem;
+		}
+		/* implicit names */
+		if (strncmp(udev_device->devpath, "/module/", 8) == 0) {
+			udev_device_set_subsystem(udev_device, "module");
+			return udev_device->subsystem;
+		}
+		if (strstr(udev_device->devpath, "/drivers/") != NULL) {
+			udev_device_set_subsystem(udev_device, "drivers");
+			return udev_device->subsystem;
+		}
+		if (strncmp(udev_device->devpath, "/subsystem/", 11) == 0 ||
+		    strncmp(udev_device->devpath, "/class/", 7) == 0 ||
+		    strncmp(udev_device->devpath, "/bus/", 5) == 0) {
+			udev_device_set_subsystem(udev_device, "subsystem");
+			return udev_device->subsystem;
+		}
 	}
-	return NULL;
+	return udev_device->subsystem;
 }
 
 /**
@@ -728,6 +744,12 @@ struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *
 	return udev_list_get_entry(&udev_device->devlinks_list);
 }
 
+void udev_device_cleanup_devlinks_list(struct udev_device *udev_device)
+{
+	udev_device->devlinks_uptodate = 0;
+	udev_list_cleanup(udev_device->udev, &udev_device->devlinks_list);
+}
+
 /**
  * udev_device_get_properties_list_entry:
  * @udev_device: udev device
@@ -746,6 +768,21 @@ struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device
 		return NULL;
 	if (!udev_device->info_loaded)
 		device_load_info(udev_device);
+	if (!udev_device->devlinks_uptodate) {
+		char symlinks[UTIL_PATH_SIZE];
+		struct udev_list_entry *list_entry;
+
+		udev_device->devlinks_uptodate = 1;
+		list_entry = udev_device_get_devlinks_list_entry(udev_device);
+		if (list_entry != NULL) {
+			util_strlcpy(symlinks, udev_list_entry_get_name(list_entry), sizeof(symlinks));
+			udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
+				util_strlcat(symlinks, " ", sizeof(symlinks));
+				util_strlcat(symlinks, udev_list_entry_get_name(list_entry), sizeof(symlinks));
+			}
+			udev_device_add_property(udev_device, "DEVLINKS", symlinks);
+		}
+	}
 	return udev_list_get_entry(&udev_device->properties_list);
 }
 
@@ -755,11 +792,11 @@ const char *udev_device_get_driver(struct udev_device *udev_device)
 
 	if (udev_device == NULL)
 		return NULL;
-	if (udev_device->driver != NULL)
-		return udev_device->driver;
-	if (util_get_sys_driver(udev_device->udev, udev_device->syspath, driver, sizeof(driver)) < 2)
-		return NULL;
-	udev_device->driver = strdup(driver);
+	if (!udev_device->driver_set) {
+		udev_device->driver_set = 1;
+		if (util_get_sys_driver(udev_device->udev, udev_device->syspath, driver, sizeof(driver)) > 0)
+			udev_device->driver = strdup(driver);
+	}
 	return udev_device->driver;
 }
 
@@ -815,7 +852,8 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
 	util_strlcat(path, attr, sizeof(path));
 
 	if (lstat(path, &statbuf) != 0) {
-		info(udev_device->udev, "stat '%s' failed: %m\n", path);
+		info(udev_device->udev, "no attribute '%s', keep negative entry\n", path);
+		udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, NULL, 0, 0);
 		goto out;
 	}
 
@@ -905,9 +943,11 @@ int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath
 
 int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem)
 {
+	free(udev_device->subsystem);
 	udev_device->subsystem = strdup(subsystem);
 	if (udev_device->subsystem == NULL)
 		return -ENOMEM;
+	udev_device->subsystem_set = 1;
 	udev_device_add_property(udev_device, "SUBSYSTEM", udev_device->subsystem);
 	return 0;
 }
@@ -916,31 +956,34 @@ int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode
 {
 	free(udev_device->devnode);
 	udev_device->devnode = strdup(devnode);
+	if (devnode == NULL)
+		return 0;
 	if (udev_device->devnode == NULL)
 		return -ENOMEM;
-	udev_device_add_property(udev_device, "DEVNODE", udev_device->devnode);
+	udev_device_add_property(udev_device, "DEVNAME", udev_device->devnode);
 	return 0;
 }
 
 int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink)
 {
-	char symlinks[UTIL_PATH_SIZE];
-	struct udev_list_entry *list_entry;
-
+	udev_device->devlinks_uptodate = 0;
 	if (udev_list_entry_add(udev_device->udev, &udev_device->devlinks_list, devlink, NULL, 1, 0) == NULL)
 		return -ENOMEM;
-	list_entry =  udev_device_get_devlinks_list_entry(udev_device);
-	util_strlcpy(symlinks, udev_list_entry_get_name(list_entry), sizeof(symlinks));
-	udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
-		util_strlcat(symlinks, " ", sizeof(symlinks));
-		util_strlcat(symlinks, udev_list_entry_get_name(list_entry), sizeof(symlinks));
-	}
-	udev_device_add_property(udev_device, "DEVLINKS", symlinks);
 	return 0;
 }
 
 struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
 {
+	udev_device->envp_uptodate = 0;
+	if (value == NULL) {
+		struct udev_list_entry *list_entry;
+
+		list_entry = udev_device_get_properties_list_entry(udev_device);
+		list_entry = udev_list_entry_get_by_name(list_entry, key);
+		if (list_entry != NULL)
+			udev_list_entry_remove(list_entry);
+		return NULL;
+	}
 	return udev_list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0);
 }
 
@@ -960,21 +1003,47 @@ struct udev_list_entry *udev_device_add_property_from_string(struct udev_device
 	return udev_device_add_property(udev_device, name, val);
 }
 
+char **udev_device_get_properties_envp(struct udev_device *udev_device)
+{
+	if (!udev_device->envp_uptodate) {
+		unsigned int i;
+		struct udev_list_entry *list_entry;
+
+		for (i = 0; i < ARRAY_SIZE(udev_device->envp) && udev_device->envp[i] != NULL; i++)
+			free(udev_device->envp[i]);
+		i = 0;
+		udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
+			asprintf(&udev_device->envp[i++], "%s=%s",
+				 udev_list_entry_get_name(list_entry),
+				 udev_list_entry_get_value(list_entry));
+			if (i+1 >= ARRAY_SIZE(udev_device->envp))
+				break;
+		}
+		udev_device->envp[i] = NULL;
+		info(udev_device->udev, "constructed envp from %u properties\n", i);
+		udev_device->envp_uptodate = 1;
+	}
+	return udev_device->envp;
+}
+
 int udev_device_set_action(struct udev_device *udev_device, const char *action)
 {
 	free(udev_device->action);
 	udev_device->action = strdup(action);
 	if (udev_device->action == NULL)
 		return -ENOMEM;
-	udev_device_add_property(udev_device, "ACTION", action);
+	udev_device_add_property(udev_device, "ACTION", udev_device->action);
 	return 0;
 }
 
 int udev_device_set_driver(struct udev_device *udev_device, const char *driver)
 {
+	free(udev_device->driver);
 	udev_device->driver = strdup(driver);
 	if (udev_device->driver == NULL)
 		return -ENOMEM;
+	udev_device->driver_set = 1;
+	udev_device_add_property(udev_device, "DRIVER", udev_device->driver);
 	return 0;
 }
 
@@ -988,6 +1057,7 @@ int udev_device_set_devpath_old(struct udev_device *udev_device, const char *dev
 	udev_device->devpath_old = strdup(devpath_old);
 	if (udev_device->devpath_old == NULL)
 		return -ENOMEM;
+	udev_device_add_property(udev_device, "DEVPATH_OLD", udev_device->devpath_old);
 	return 0;
 }
 
@@ -1029,13 +1099,24 @@ int udev_device_set_event_timeout(struct udev_device *udev_device, int event_tim
 
 int udev_device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum)
 {
+	char num[32];
+
 	udev_device->seqnum = seqnum;
+	snprintf(num, sizeof(num), "%llu", seqnum);
+	udev_device_add_property(udev_device, "SEQNUM", num);
 	return 0;
 }
 
 int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
 {
+	char num[32];
+
 	udev_device->devnum = devnum;
+
+	snprintf(num, sizeof(num), "%u", major(devnum));
+	udev_device_add_property(udev_device, "MAJOR", num);
+	snprintf(num, sizeof(num), "%u", minor(devnum));
+	udev_device_add_property(udev_device, "MINOR", num);
 	return 0;
 }