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

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 2f685bd8e..8812f1fc8 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -31,8 +31,9 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
+#define ENVP_SIZE 128
+
 struct udev_device {
-	int refcount;
 	struct udev *udev;
 	struct udev_device *parent_device;
 	char *syspath;
@@ -41,21 +42,28 @@ struct udev_device {
 	const char *sysnum;
 	char *devnode;
 	char *subsystem;
-	struct udev_list_node devlinks_list;
-	struct udev_list_node properties_list;
-	char *action;
-	int event_timeout;
+	char **envp;
 	char *driver;
+	char *action;
 	char *devpath_old;
 	char *physdevpath;
-	int timeout;
-	dev_t devnum;
+	struct udev_list_node devlinks_list;
+	struct udev_list_node properties_list;
+	struct udev_list_node sysattr_list;
 	unsigned long long int seqnum;
+	int event_timeout;
+	int timeout;
 	int num_fake_partitions;
 	int devlink_priority;
-	int ignore_remove;
-	struct udev_list_node attr_list;
-	int info_loaded;
+	int refcount;
+	dev_t devnum;
+	unsigned int parent_set:1;
+	unsigned int subsystem_set:1;
+	unsigned int devlinks_uptodate:1;
+	unsigned int envp_uptodate:1;
+	unsigned int driver_set:1;
+	unsigned int info_loaded:1;
+	unsigned int ignore_remove:1;
 };
 
 static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len)
@@ -69,7 +77,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 +182,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 +221,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,19 +233,25 @@ 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;
 
-	udev_device = malloc(sizeof(struct udev_device));
+	udev_device = calloc(1, sizeof(struct udev_device));
 	if (udev_device == NULL)
 		return NULL;
-	memset(udev_device, 0x00, sizeof(struct udev_device));
 	udev_device->refcount = 1;
 	udev_device->udev = udev;
 	udev_list_init(&udev_device->devlinks_list);
 	udev_list_init(&udev_device->properties_list);
-	udev_list_init(&udev_device->attr_list);
+	udev_list_init(&udev_device->sysattr_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 +526,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 +592,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--;
@@ -589,13 +605,18 @@ void udev_device_unref(struct udev_device *udev_device)
 	free(udev_device->sysname);
 	free(udev_device->devnode);
 	free(udev_device->subsystem);
-	udev_list_cleanup(udev_device->udev, &udev_device->devlinks_list);
-	udev_list_cleanup(udev_device->udev, &udev_device->properties_list);
+	udev_list_cleanup_entries(udev_device->udev, &udev_device->devlinks_list);
+	udev_list_cleanup_entries(udev_device->udev, &udev_device->properties_list);
 	free(udev_device->action);
 	free(udev_device->driver);
 	free(udev_device->devpath_old);
 	free(udev_device->physdevpath);
-	udev_list_cleanup(udev_device->udev, &udev_device->attr_list);
+	udev_list_cleanup_entries(udev_device->udev, &udev_device->sysattr_list);
+	if (udev_device->envp != NULL) {
+		for (i = 0; i < ENVP_SIZE && udev_device->envp[i] != NULL; i++)
+			free(udev_device->envp[i]);
+		free(udev_device->envp);
+	}
 	info(udev_device->udev, "udev_device: %p released\n", udev_device);
 	free(udev_device);
 }
@@ -679,31 +700,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 +748,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_entries(udev_device->udev, &udev_device->devlinks_list);
+}
+
 /**
  * udev_device_get_properties_list_entry:
  * @udev_device: udev device
@@ -746,6 +772,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 +796,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;
 }
 
@@ -786,7 +827,7 @@ unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device)
 	return udev_device->seqnum;
 }
 
-const char *udev_device_get_attr_value(struct udev_device *udev_device, const char *attr)
+const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr)
 {
 	struct udev_list_entry *list_entry;
 	char path[UTIL_PATH_SIZE];
@@ -798,24 +839,25 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
 
 	if (udev_device == NULL)
 		return NULL;
-	if (attr == NULL)
+	if (sysattr == NULL)
 		return NULL;
 
 	/* look for possibly already cached result */
-	udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_device->attr_list)) {
-		if (strcmp(udev_list_entry_get_name(list_entry), attr) == 0) {
+	udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_device->sysattr_list)) {
+		if (strcmp(udev_list_entry_get_name(list_entry), sysattr) == 0) {
 			info(udev_device->udev, "got '%s' (%s) from cache\n",
-			     attr, udev_list_entry_get_value(list_entry));
+			     sysattr, udev_list_entry_get_value(list_entry));
 			return udev_list_entry_get_value(list_entry);
 		}
 	}
 
 	util_strlcpy(path, udev_device_get_syspath(udev_device), sizeof(path));
 	util_strlcat(path, "/", sizeof(path));
-	util_strlcat(path, attr, sizeof(path));
+	util_strlcat(path, sysattr, 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->sysattr_list, sysattr, NULL, 0, 0);
 		goto out;
 	}
 
@@ -831,8 +873,8 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
 			pos = strrchr(target, '/');
 			if (pos != NULL) {
 				pos = &pos[1];
-				info(udev_device->udev, "cache '%s' with link value '%s'\n", attr, pos);
-				list_entry = udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, pos, 0, 0);
+				info(udev_device->udev, "cache '%s' with link value '%s'\n", sysattr, pos);
+				list_entry = udev_list_entry_add(udev_device->udev, &udev_device->sysattr_list, sysattr, pos, 0, 0);
 				val = udev_list_entry_get_value(list_entry);
 			}
 		}
@@ -864,7 +906,7 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
 	value[size] = '\0';
 	util_remove_trailing_chars(value, '\n');
 	info(udev_device->udev, "'%s' has attribute value '%s'\n", path, value);
-	list_entry = udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, value, 0, 0);
+	list_entry = udev_list_entry_add(udev_device->udev, &udev_device->sysattr_list, sysattr, value, 0, 0);
 	val = udev_list_entry_get_value(list_entry);
 out:
 	return val;
@@ -898,16 +940,23 @@ int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath
 	}
 
 	/* trailing number */
-	while (isdigit(udev_device->sysname[--len]))
+	while (len > 0 && isdigit(udev_device->sysname[--len]))
 		udev_device->sysnum = &udev_device->sysname[len];
+
+	/* sysname is completely numeric */
+	if (len == 0)
+		udev_device->sysnum = NULL;
+
 	return 0;
 }
 
 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 +965,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);
 }
 
@@ -949,7 +1001,7 @@ struct udev_list_entry *udev_device_add_property_from_string(struct udev_device
 	char name[UTIL_PATH_SIZE];
 	char *val;
 
-	strncpy(name, property, sizeof(name));
+	util_strlcpy(name, property, sizeof(name));
 	val = strchr(name, '=');
 	if (val == NULL)
 		return NULL;
@@ -960,21 +1012,51 @@ 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;
+
+		if (udev_device->envp) {
+			for (i = 0; i < ENVP_SIZE && udev_device->envp[i] != NULL; i++)
+				free(udev_device->envp[i]);
+		} else
+			udev_device->envp = malloc(sizeof(char *) * ENVP_SIZE);
+
+		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 >= ENVP_SIZE)
+				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 +1070,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 +1112,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;
 }