X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-device.c;h=055263bbef750232c22d48ff1b535f19ec634448;hb=1028fe14b65d861415cda99c4ff7d0bafd67bb7f;hp=513c65653bc76c17d8e7547ec6427d14db213f16;hpb=b62557daff59dbe3096dc31ac1f42a20ff6a9f92;p=elogind.git

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 513c65653..055263bbe 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -31,8 +31,6 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
-#define ENVP_SIZE 128
-
 struct udev_device {
 	struct udev *udev;
 	struct udev_device *parent_device;
@@ -42,11 +40,11 @@ struct udev_device {
 	const char *sysnum;
 	char *devnode;
 	char *subsystem;
-	char **envp;
 	char *driver;
 	char *action;
 	char *devpath_old;
 	char *physdevpath;
+	char **envp;
 	char *monitor_buf;
 	size_t monitor_buf_len;
 	struct udev_list_node devlinks_list;
@@ -89,7 +87,7 @@ int udev_device_read_db(struct udev_device *udev_device)
 	devpath_to_db_path(udev_device->udev, udev_device->devpath, filename, sizeof(filename));
 
 	if (lstat(filename, &stats) != 0) {
-		info(udev_device->udev, "no db file to read %s: %m\n", filename);
+		dbg(udev_device->udev, "no db file to read %s: %m\n", filename);
 		return -1;
 	}
 	if ((stats.st_mode & S_IFMT) == S_IFLNK) {
@@ -102,7 +100,7 @@ int udev_device_read_db(struct udev_device *udev_device)
 		if (target_len > 0)
 			target[target_len] = '\0';
 		else {
-			info(udev_device->udev, "error reading db link %s: %m\n", filename);
+			dbg(udev_device->udev, "error reading db link %s: %m\n", filename);
 			return -1;
 		}
 
@@ -136,7 +134,7 @@ int udev_device_read_db(struct udev_device *udev_device)
 
 	f = fopen(filename, "r");
 	if (f == NULL) {
-		info(udev_device->udev, "error reading db file %s: %m\n", filename);
+		dbg(udev_device->udev, "error reading db file %s: %m\n", filename);
 		return -1;
 	}
 	while (fgets(line, sizeof(line), f)) {
@@ -254,7 +252,7 @@ struct udev_device *device_new(struct udev *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);
+	dbg(udev_device->udev, "udev_device: %p created\n", udev_device);
 	return udev_device;
 }
 
@@ -268,7 +266,7 @@ struct udev_device *device_new(struct udev *udev)
  * path to the device, including the sys mount point.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev device.
+ * release the resources of the udev device.
  *
  * Returns: a new udev device, or #NULL, if it does not exist
  **/
@@ -297,7 +295,7 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
 	subdir = &syspath[len+1];
 	pos = strrchr(subdir, '/');
 	if (pos == NULL || pos < &subdir[2]) {
-		info(udev, "not a subdir :%s\n", syspath);
+		dbg(udev, "not a subdir :%s\n", syspath);
 		return NULL;
 	}
 
@@ -332,13 +330,13 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
 		util_strlcpy(file, path, sizeof(file));
 		util_strlcat(file, "/uevent", sizeof(file));
 		if (stat(file, &statbuf) != 0) {
-			info(udev, "not a device: %s\n", syspath);
+			dbg(udev, "not a device: %s\n", syspath);
 			return NULL;
 		}
 	} else {
 		/* everything else just needs to be a directory */
 		if (stat(path, &statbuf) != 0 || !S_ISDIR(statbuf.st_mode)) {
-			info(udev, "directory not found: %s\n", syspath);
+			dbg(udev, "directory not found: %s\n", syspath);
 			return NULL;
 		}
 	}
@@ -503,9 +501,11 @@ static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
 	    strncmp(udev_device->devpath, "/block/", 7) == 0) {
 		util_strlcpy(path, udev_device->syspath, sizeof(path));
 		util_strlcat(path, "/device", sizeof(path));
-		if (util_resolve_sys_link(udev_device->udev, path, sizeof(path)) == 0)
+		if (util_resolve_sys_link(udev_device->udev, path, sizeof(path)) == 0) {
 			udev_device_parent = udev_device_new_from_syspath(udev_device->udev, path);
-		return udev_device_parent;
+			if (udev_device_parent != NULL)
+				return udev_device_parent;
+		}
 	}
 
 	util_strlcpy(path, udev_device->syspath, sizeof(path));
@@ -533,7 +533,7 @@ struct udev_device *udev_device_get_parent(struct udev_device *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);
+		dbg(udev_device->udev, "returning existing parent %p\n", udev_device->parent_device);
 	return udev_device->parent_device;
 }
 
@@ -589,13 +589,11 @@ struct udev_device *udev_device_ref(struct udev_device *udev_device)
  * @udev_device: udev device
  *
  * Drop a reference of a udev device. If the refcount reaches zero,
- * the ressources of the device will be released.
+ * the resources of the device will be released.
  *
  **/
 void udev_device_unref(struct udev_device *udev_device)
 {
-	unsigned int i;
-
 	if (udev_device == NULL)
 		return;
 	udev_device->refcount--;
@@ -614,13 +612,9 @@ void udev_device_unref(struct udev_device *udev_device)
 	free(udev_device->devpath_old);
 	free(udev_device->physdevpath);
 	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);
-	}
+	free(udev_device->envp);
 	free(udev_device->monitor_buf);
-	info(udev_device->udev, "udev_device: %p released\n", udev_device);
+	dbg(udev_device->udev, "udev_device: %p released\n", udev_device);
 	free(udev_device);
 }
 
@@ -848,8 +842,8 @@ const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const
 	/* look for possibly already cached result */
 	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",
-			     sysattr, udev_list_entry_get_value(list_entry));
+			dbg(udev_device->udev, "got '%s' (%s) from cache\n",
+			    sysattr, udev_list_entry_get_value(list_entry));
 			return udev_list_entry_get_value(list_entry);
 		}
 	}
@@ -859,24 +853,29 @@ const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const
 	util_strlcat(path, sysattr, sizeof(path));
 
 	if (lstat(path, &statbuf) != 0) {
-		info(udev_device->udev, "no attribute '%s', keep negative entry\n", path);
+		dbg(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;
 	}
 
 	if (S_ISLNK(statbuf.st_mode)) {
-		/* links return the last element of the target path */
 		char target[UTIL_NAME_SIZE];
 		int len;
 		char *pos;
 
+		/* some core links return the last element of the target path */
+		if (strcmp(sysattr, "driver") != 0 &&
+		    strcmp(sysattr, "subsystem") != 0 &&
+		    strcmp(sysattr, "module") != 0)
+			goto out;
+
 		len = readlink(path, target, sizeof(target));
 		if (len > 0) {
 			target[len] = '\0';
 			pos = strrchr(target, '/');
 			if (pos != NULL) {
 				pos = &pos[1];
-				info(udev_device->udev, "cache '%s' with link value '%s'\n", sysattr, pos);
+				dbg(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);
 			}
@@ -895,7 +894,7 @@ const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const
 	/* read attribute value */
 	fd = open(path, O_RDONLY);
 	if (fd < 0) {
-		info(udev_device->udev, "attribute '%s' can not be opened\n", path);
+		dbg(udev_device->udev, "attribute '%s' can not be opened\n", path);
 		goto out;
 	}
 	size = read(fd, value, sizeof(value));
@@ -908,7 +907,7 @@ const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const
 	/* got a valid value, store it in cache and return it */
 	value[size] = '\0';
 	util_remove_trailing_chars(value, '\n');
-	info(udev_device->udev, "'%s' has attribute value '%s'\n", path, value);
+	dbg(udev_device->udev, "'%s' has attribute value '%s'\n", path, value);
 	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:
@@ -986,7 +985,6 @@ int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink
 
 struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
 {
-	udev_device->monitor_buf_len = 0;
 	udev_device->envp_uptodate = 0;
 	if (value == NULL) {
 		struct udev_list_entry *list_entry;
@@ -994,7 +992,7 @@ struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device
 		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);
+			udev_list_entry_delete(list_entry);
 		return NULL;
 	}
 	return udev_list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0);
@@ -1016,83 +1014,88 @@ 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)
+#define ENVP_SIZE			128
+#define MONITOR_BUF_SIZE		4096
+static int update_envp_monitor_buf(struct udev_device *udev_device)
 {
-	if (!udev_device->envp_uptodate) {
-		unsigned int i;
-		struct udev_list_entry *list_entry;
+	const char *action;
+	struct udev_list_entry *list_entry;
+	size_t bufpos;
+	size_t len;
+	unsigned int i;
 
-		if (udev_device->envp != NULL) {
-			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);
-		}
+	/* monitor buffer of property strings */
+	free(udev_device->monitor_buf);
+	udev_device->monitor_buf_len = 0;
+	udev_device->monitor_buf = malloc(MONITOR_BUF_SIZE);
+	if (udev_device->monitor_buf == NULL)
+		return -ENOMEM;
 
-		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;
-}
+	/* envp array, strings will point into monitor buffer */
+	if (udev_device->envp == NULL)
+		udev_device->envp = malloc(sizeof(char *) * ENVP_SIZE);
+	if (udev_device->envp == NULL)
+		return -ENOMEM;
 
-#define MONITOR_BUF_SIZE		4096
-ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf)
-{
-	if (udev_device->monitor_buf_len == 0) {
-		const char *action;
-		struct udev_list_entry *list_entry;
-		size_t bufpos;
-		size_t len;
+	/* header <action>@<devpath> */
+	action = udev_device_get_action(udev_device);
+	if (action == NULL)
+		return -EINVAL;
+	bufpos = util_strlcpy(udev_device->monitor_buf, action, MONITOR_BUF_SIZE);
+	len = util_strlcpy(&udev_device->monitor_buf[bufpos], "@", MONITOR_BUF_SIZE-bufpos);
+	if (len >= MONITOR_BUF_SIZE-bufpos)
+		return -EINVAL;
+	bufpos += len;
+	len = util_strlcpy(&udev_device->monitor_buf[bufpos],
+			   udev_device_get_devpath(udev_device),
+			   MONITOR_BUF_SIZE-bufpos);
+	if (len+1 >= MONITOR_BUF_SIZE-bufpos)
+		return -EINVAL;
+	bufpos += len+1;
 
-		free(udev_device->monitor_buf);
-		udev_device->monitor_buf = malloc(MONITOR_BUF_SIZE);
-		if (udev_device->monitor_buf == NULL)
-			return -ENOMEM;
+	i = 0;
+	udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
+		/* add string to envp array */
+		udev_device->envp[i++] = &udev_device->monitor_buf[bufpos];
+		if (i+1 >= ENVP_SIZE)
+			return -EINVAL;
 
-		/* header <action>@<devpath> */
-		action = udev_device_get_action(udev_device);
-		if (action == NULL)
+		/* add property string to monitor buffer */
+		len = util_strlcpy(&udev_device->monitor_buf[bufpos],
+				   udev_list_entry_get_name(list_entry), MONITOR_BUF_SIZE-bufpos);
+		if (len >= MONITOR_BUF_SIZE-bufpos)
 			return -EINVAL;
-		bufpos = util_strlcpy(udev_device->monitor_buf, action, MONITOR_BUF_SIZE);
-		len = util_strlcpy(&udev_device->monitor_buf[bufpos], "@", MONITOR_BUF_SIZE-bufpos);
+		bufpos += len;
+		len = util_strlcpy(&udev_device->monitor_buf[bufpos], "=", MONITOR_BUF_SIZE-bufpos);
 		if (len >= MONITOR_BUF_SIZE-bufpos)
 			return -EINVAL;
 		bufpos += len;
-		len = util_strlcpy(&udev_device->monitor_buf[bufpos],
-				   udev_device_get_devpath(udev_device),
+		len = util_strlcpy(&udev_device->monitor_buf[bufpos], udev_list_entry_get_value(list_entry),
 				   MONITOR_BUF_SIZE-bufpos);
 		if (len+1 >= MONITOR_BUF_SIZE-bufpos)
 			return -EINVAL;
 		bufpos += len+1;
-
-		/* property strings */
-		udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
-			len = util_strlcpy(&udev_device->monitor_buf[bufpos],
-					   udev_list_entry_get_name(list_entry), MONITOR_BUF_SIZE-bufpos);
-			if (len >= MONITOR_BUF_SIZE-bufpos)
-				return -EINVAL;
-			bufpos += len;
-			len = util_strlcpy(&udev_device->monitor_buf[bufpos], "=", MONITOR_BUF_SIZE-bufpos);
-			if (len >= MONITOR_BUF_SIZE-bufpos)
-				return -EINVAL;
-			bufpos += len;
-			len = util_strlcpy(&udev_device->monitor_buf[bufpos], udev_list_entry_get_value(list_entry),
-					   MONITOR_BUF_SIZE-bufpos);
-			if (len+1 >= MONITOR_BUF_SIZE-bufpos)
-				return -EINVAL;
-			bufpos += len+1;
-		}
-		udev_device->monitor_buf_len = bufpos;
 	}
+	udev_device->envp[i] = NULL;
+	udev_device->monitor_buf_len = bufpos;
+	udev_device->envp_uptodate = 1;
+	dbg(udev_device->udev, "filled envp/monitor buffer, %u properties, %zu bytes\n", i, bufpos);
+	return 0;
+}
+
+char **udev_device_get_properties_envp(struct udev_device *udev_device)
+{
+	if (!udev_device->envp_uptodate)
+		if (update_envp_monitor_buf(udev_device) != 0)
+			return NULL;
+	return udev_device->envp;
+}
+
+ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf)
+{
+	if (!udev_device->envp_uptodate)
+		if (update_envp_monitor_buf(udev_device) != 0)
+			return -EINVAL;
 	*buf = udev_device->monitor_buf;
 	return udev_device->monitor_buf_len;
 }