X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-device.c;h=f3f20cd99242a41cc4722a114451a4dbfe2c24fb;hp=00b9440386171542f294bbbcb2f6f6393ec01108;hb=4ad3a37f50ed3af4158cd0d0badbd146eb8e3500;hpb=1c7047ea77a417f183b6b92f4f5ea3728acef79b

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 00b944038..f3f20cd99 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -30,13 +30,13 @@
 
 #include "libudev.h"
 #include "libudev-private.h"
-#include "../udev.h"
 
 struct udev_device {
 	int refcount;
 	struct udev *udev;
-	char *devpath;
 	char *syspath;
+	const char *devpath;
+	const char *sysname;
 	char *devname;
 	char *subsystem;
 	struct list_head link_list;
@@ -47,9 +47,107 @@ struct udev_device {
 	char *physdevpath;
 	int timeout;
 	dev_t devnum;
-	long long int seqnum;
+	unsigned long long int seqnum;
+	int num_fake_partitions;
+	int devlink_priority;
+	int ignore_remove;
 };
 
+static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len)
+{
+	size_t start;
+
+	/* translate to location of db file */
+	util_strlcpy(filename, udev_get_dev_path(udev), len);
+	start = util_strlcat(filename, "/.udev/db/", len);
+	util_strlcat(filename, devpath, len);
+	return util_path_encode(&filename[start], len - start);
+}
+
+static int device_read_db(struct udev_device *udev_device)
+{
+	struct stat stats;
+	char filename[UTIL_PATH_SIZE];
+	char line[UTIL_LINE_SIZE];
+	FILE *f;
+	int rc = 0;
+
+	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: %s\n", filename, strerror(errno));
+		return -1;
+	}
+	if ((stats.st_mode & S_IFMT) == S_IFLNK) {
+		char target[UTIL_PATH_SIZE];
+		int target_len;
+
+		info(udev_device->udev, "found a symlink as db file\n");
+		target_len = readlink(filename, target, sizeof(target));
+		if (target_len > 0)
+			target[target_len] = '\0';
+		else {
+			info(udev_device->udev, "error reading db link %s: %s\n", filename, strerror(errno));
+			return -1;
+		}
+		dbg(udev_device->udev, "db link points to '%s'\n", target);
+		if (asprintf(&udev_device->devname, "%s/%s", udev_get_dev_path(udev_device->udev), target) < 0)
+			return -ENOMEM;
+		return 0;
+	}
+
+	f = fopen(filename, "r");
+	if (f == NULL) {
+		info(udev_device->udev, "error reading db file %s: %s\n", filename, strerror(errno));
+		return -1;
+	}
+	while (fgets(line, sizeof(line), f)) {
+		ssize_t len;
+		const char *val;
+		unsigned int maj, min;
+
+		len = strlen(line);
+		if (len < 4)
+			break;
+		line[len-1] = '\0';
+		val = &line[2];
+
+		switch(line[0]) {
+		case 'N':
+			asprintf(&udev_device->devname, "%s/%s", udev_get_dev_path(udev_device->udev), val);
+			break;
+		case 'M':
+			sscanf(val, "%u:%u", &maj, &min);
+			device_set_devnum(udev_device, makedev(maj, min));
+			break;
+		case 'S':
+			util_strlcpy(filename, udev_get_dev_path(udev_device->udev), sizeof(filename));
+			util_strlcat(filename, "/", sizeof(filename));
+			util_strlcat(filename, val, sizeof(filename));
+			device_add_devlink(udev_device, filename);
+			break;
+		case 'L':
+			device_set_devlink_priority(udev_device, atoi(val));
+			break;
+		case 'T':
+			device_set_timeout(udev_device,  atoi(val));
+			break;
+		case 'A':
+			device_set_num_fake_partitions(udev_device, atoi(val));
+			break;
+		case 'R':
+			device_set_ignore_remove(udev_device, atoi(val));
+			break;
+		case 'E':
+			device_add_property(udev_device, val);
+			break;
+		}
+	}
+	fclose(f);
+
+	return rc;
+}
+
 struct udev_device *device_init(struct udev *udev)
 {
 	struct udev_device *udev_device;
@@ -85,62 +183,59 @@ struct udev_device *device_init(struct udev *udev)
  **/
 struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char *devpath)
 {
-	char path[PATH_SIZE];
+	char path[UTIL_PATH_SIZE];
 	struct stat statbuf;
 	struct udev_device *udev_device;
-	struct udevice *udevice;
-	struct name_entry *name_loop;
-	int err;
 
 	if (udev == NULL)
 		return NULL;
 	if (devpath == NULL)
 		return NULL;
 
-	strlcpy(path, udev_get_sys_path(udev), sizeof(path));
-	strlcat(path, devpath, sizeof(path));
-	if (stat(path, &statbuf) != 0)
-		return NULL;
-	if (!S_ISDIR(statbuf.st_mode))
+	util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
+	util_strlcat(path, devpath, sizeof(path));
+	util_strlcat(path, "/uevent", sizeof(path));
+	if (stat(path, &statbuf) != 0) {
+		info(udev, "not a device :%s\n", path);
 		return NULL;
+	}
 
 	udev_device = device_init(udev);
 	if (udev_device == NULL)
 		return NULL;
 
-	udevice = udev_device_init(udev);
-	if (udevice == NULL) {
-		free(udev_device);
-		return NULL;
-	}
-
 	/* resolve possible symlink to real path */
-	strlcpy(path, devpath, sizeof(path));
-	sysfs_resolve_link(udev, path, sizeof(path));
-	device_set_devpath(udev_device, devpath);
+	util_strlcpy(path, devpath, sizeof(path));
+	util_resolve_sys_link(udev, path, sizeof(path));
+	device_set_devpath(udev_device, path);
 	info(udev, "device %p has devpath '%s'\n", udev_device, udev_device_get_devpath(udev_device));
 
-	err = udev_db_get_device(udevice, path);
-	if (err >= 0)
+	if (device_read_db(udev_device) >= 0)
 		info(udev, "device %p filled with udev database data\n", udev_device);
 
-	if (udevice->name[0] != '\0')
-		asprintf(&udev_device->devname, "%s/%s", udev_get_dev_path(udev), udevice->name);
-
-	list_for_each_entry(name_loop, &udevice->symlink_list, node) {
-		char name[PATH_SIZE];
+	return udev_device;
+}
 
-		strlcpy(name, udev_get_dev_path(udev), sizeof(name));
-		strlcat(name, "/", sizeof(name));
-		strlcat(name, name_loop->name, sizeof(name));
-		name_list_add(udev, &udev_device->link_list, name, 0);
-	}
+struct udev_device *udev_device_new_from_parent(struct udev_device *udev_device)
+{
+	struct udev_device *udev_device_parent = NULL;
+	char path[UTIL_PATH_SIZE];
+	char *pos;
 
-	list_for_each_entry(name_loop, &udevice->env_list, node)
-		name_list_add(udev_device->udev, &udev_device->env_list, name_loop->name, 0);
+	if (udev_device == NULL)
+		return NULL;
 
-	udev_device_cleanup(udevice);
-	return udev_device;
+	util_strlcpy(path, udev_device_get_devpath(udev_device), sizeof(path));
+	while (1) {
+		pos = strrchr(path, '/');
+		if (pos == NULL)
+			break;
+		pos[0] = '\0';
+		udev_device_parent = udev_device_new_from_devpath(udev_device->udev, path);
+		if (udev_device_parent != NULL)
+			break;
+	}
+	return udev_device_parent;
 }
 
 /**
@@ -192,8 +287,8 @@ void udev_device_unref(struct udev_device *udev_device)
 	free(udev_device->syspath);
 	free(udev_device->devname);
 	free(udev_device->subsystem);
-	name_list_cleanup(udev_device->udev, &udev_device->link_list);
-	name_list_cleanup(udev_device->udev, &udev_device->env_list);
+	util_name_list_cleanup(udev_device->udev, &udev_device->link_list);
+	util_name_list_cleanup(udev_device->udev, &udev_device->env_list);
 	free(udev_device->action);
 	free(udev_device->driver);
 	free(udev_device->devpath_old);
@@ -234,6 +329,13 @@ const char *udev_device_get_syspath(struct udev_device *udev_device)
 	return udev_device->syspath;
 }
 
+const char *udev_device_get_sysname(struct udev_device *udev_device)
+{
+	if (udev_device == NULL)
+		return NULL;
+	return udev_device->sysname;
+}
+
 /**
  * udev_device_get_devname:
  * @udev_device: udev device
@@ -261,7 +363,7 @@ const char *udev_device_get_devname(struct udev_device *udev_device)
  **/
 const char *udev_device_get_subsystem(struct udev_device *udev_device)
 {
-	char subsystem[NAME_SIZE];
+	char subsystem[UTIL_NAME_SIZE];
 
 	if (udev_device == NULL)
 		return NULL;
@@ -291,7 +393,7 @@ int udev_device_get_devlinks(struct udev_device *udev_device,
 			      int (*cb)(struct udev_device *udev_device, const char *value, void *data),
 			      void *data)
 {
-	struct name_entry *name_loop;
+	struct util_name_entry *name_loop;
 	int count = 0;
 
 	if (udev_device == NULL)
@@ -321,17 +423,16 @@ int udev_device_get_properties(struct udev_device *udev_device,
 				int (*cb)(struct udev_device *udev_device, const char *key, const char *value, void *data),
 				void *data)
 {
-	struct name_entry *name_loop;
+	struct util_name_entry *name_loop;
 	int count = 0;
 
 	if (udev_device == NULL)
 		return -1;
 	list_for_each_entry(name_loop, &udev_device->env_list, node) {
-		char name[PATH_SIZE];
+		char name[UTIL_NAME_SIZE];
 		char *val;
 
-		strncpy(name, name_loop->name, PATH_SIZE);
-		name[PATH_SIZE-1] = '\0';
+		strncpy(name, name_loop->name, sizeof(name));
 		val = strchr(name, '=');
 		if (val == NULL)
 			continue;
@@ -346,8 +447,15 @@ int udev_device_get_properties(struct udev_device *udev_device,
 
 const char *udev_device_get_driver(struct udev_device *udev_device)
 {
+	char driver[UTIL_NAME_SIZE];
+
 	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->devpath, driver, sizeof(driver)) < 2)
+		return NULL;
+	udev_device->driver = strdup(driver);
 	return udev_device->driver;
 }
 
@@ -377,6 +485,9 @@ int device_set_devpath(struct udev_device *udev_device, const char *devpath)
 	if (asprintf(&udev_device->syspath, "%s%s", udev_get_sys_path(udev_device->udev), devpath) < 0)
 		return -ENOMEM;
 	udev_device->devpath = &udev_device->syspath[strlen(udev_get_sys_path(udev_device->udev))];
+	udev_device->sysname = strrchr(udev_device->syspath, '/');
+	if (udev_device->sysname != NULL)
+		udev_device->sysname = &udev_device->sysname[1];
 	return 0;
 }
 
@@ -398,14 +509,14 @@ int device_set_devname(struct udev_device *udev_device, const char *devname)
 
 int device_add_devlink(struct udev_device *udev_device, const char *devlink)
 {
-	if (name_list_add(udev_device->udev, &udev_device->link_list, devlink, 0) == NULL)
+	if (util_name_list_add(udev_device->udev, &udev_device->link_list, devlink, 0) == NULL)
 		return -ENOMEM;
 	return 0;
 }
 
 int device_add_property(struct udev_device *udev_device, const char *property)
 {
-	if (name_list_add(udev_device->udev, &udev_device->env_list, property, 0) == NULL)
+	if (util_name_list_add(udev_device->udev, &udev_device->env_list, property, 0) == NULL)
 		return -ENOMEM;
 	return 0;
 }
@@ -480,3 +591,43 @@ int device_set_devnum(struct udev_device *udev_device, dev_t devnum)
 	udev_device->devnum = devnum;
 	return 0;
 }
+
+int device_get_num_fake_partitions(struct udev_device *udev_device)
+{
+	if (udev_device == NULL)
+		return -1;
+	return udev_device->num_fake_partitions;
+}
+
+int device_set_num_fake_partitions(struct udev_device *udev_device, int num)
+{
+	udev_device->num_fake_partitions = num;
+	return 0;
+}
+
+int device_get_devlink_priority(struct udev_device *udev_device)
+{
+	if (udev_device == NULL)
+		return -1;
+	return udev_device->devlink_priority;
+}
+
+int device_set_devlink_priority(struct udev_device *udev_device, int prio)
+{
+	 udev_device->devlink_priority = prio;
+	return 0;
+}
+
+int device_get_ignore_remove(struct udev_device *udev_device)
+{
+	if (udev_device == NULL)
+		return -1;
+	return udev_device->ignore_remove;
+}
+
+int device_set_ignore_remove(struct udev_device *udev_device, int ignore)
+{
+	udev_device->ignore_remove = ignore;
+	return 0;
+}
+