X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-node.c;h=b39100dcee0a24f416cdeafb6d563e2c43bd9d85;hp=9f2b6cf0146d90afa6eccf5b5900a887e78cb117;hb=6880b25d4044f2d154908f88e717435412187355;hpb=8460299b572eb13e7b97a0956b59c053f9009afa

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 9f2b6cf01..b39100dce 100644
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 #include "udev.h"
-#include "udev-rules.h"
 
 #define TMP_FILE_EXT		".udev-tmp"
 
@@ -54,14 +53,14 @@ static int name_index(struct udev *udev, const char *devpath, const char *name,
 
 	if (add) {
 		info(udev, "creating index: '%s'\n", filename);
-		create_path(udev, filename);
+		util_create_path(udev, filename);
 		fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
 		if (fd > 0)
 			close(fd);
 	} else {
 		info(udev, "removing index: '%s'\n", filename);
 		unlink(filename);
-		delete_path(udev, filename);
+		util_delete_path(udev, filename);
 	}
 	return 0;
 }
@@ -227,7 +226,7 @@ exit:
 	return err;
 }
 
-static int get_devices_by_name(struct udev *udev, const char *name, struct list_head *name_list)
+static int name_index_get_devices(struct udev *udev, const char *name, struct udev_list_node *dev_list)
 {
 	char dirname[PATH_MAX];
 	size_t devlen = strlen(udev_get_dev_path(udev))+1;
@@ -239,15 +238,14 @@ static int get_devices_by_name(struct udev *udev, const char *name, struct list_
 	start = util_strlcat(dirname, "/.udev/names/", sizeof(dirname));
 	util_strlcat(dirname, &name[devlen], sizeof(dirname));
 	util_path_encode(&dirname[start], sizeof(dirname) - start);
-
 	dir = opendir(dirname);
 	if (dir == NULL) {
 		info(udev, "no index directory '%s': %m\n", dirname);
 		count = -1;
 		goto out;
 	}
-
 	info(udev, "found index directory '%s'\n", dirname);
+
 	while (1) {
 		struct dirent *ent;
 		char device[UTIL_PATH_SIZE];
@@ -261,7 +259,7 @@ static int get_devices_by_name(struct udev *udev, const char *name, struct list_
 		util_strlcpy(device, udev_get_sys_path(udev), sizeof(device));
 		util_strlcat(device, ent->d_name, sizeof(device));
 		util_path_decode(device);
-		name_list_add(udev, name_list, device, 0);
+		udev_list_entry_add(udev, dev_list, device, NULL, 1, 0);
 		count++;
 	}
 	closedir(dir);
@@ -272,8 +270,8 @@ out:
 static int update_link(struct udev_device *dev, const char *slink, int test)
 {
 	struct udev *udev = udev_device_get_udev(dev);
-	LIST_HEAD(name_list);
-	struct name_entry *device;
+	struct udev_list_node dev_list;
+	struct udev_list_entry *dev_entry;
 	char target[UTIL_PATH_SIZE] = "";
 	int count;
 	int priority = 0;
@@ -281,7 +279,8 @@ static int update_link(struct udev_device *dev, const char *slink, int test)
 
 	info(udev, "update symlink '%s' of '%s'\n", slink, udev_device_get_syspath(dev));
 
-	count = get_devices_by_name(udev, slink, &name_list);
+	udev_list_init(&dev_list);
+	count = name_index_get_devices(udev, slink, &dev_list);
 	info(udev, "found %i devices with name '%s'\n", count, slink);
 
 	/* if we don't have a reference, delete it */
@@ -289,20 +288,22 @@ static int update_link(struct udev_device *dev, const char *slink, int test)
 		info(udev, "no reference left, remove '%s'\n", slink);
 		if (!test) {
 			unlink(slink);
-			delete_path(udev, slink);
+			util_delete_path(udev, slink);
 		}
 		goto out;
 	}
 
 	/* find the device with the highest priority */
-	list_for_each_entry(device, &name_list, node) {
+	udev_list_entry_foreach(dev_entry, udev_list_get_entry(&dev_list)) {
+		const char *syspath;
 		struct udev_device *dev_db;
 		const char *devnode;
 
-		info(udev, "found '%s' for '%s'\n", device->name, slink);
+		syspath = udev_list_entry_get_name(dev_entry);
+		info(udev, "found '%s' for '%s'\n", syspath, slink);
 
 		/* did we find ourself? we win, if we have the same priority */
-		if (strcmp(udev_device_get_syspath(dev), device->name) == 0) {
+		if (strcmp(udev_device_get_syspath(dev), syspath) == 0) {
 			info(udev, "compare (our own) priority of '%s' %i >= %i\n",
 			     udev_device_get_devpath(dev), udev_device_get_devlink_priority(dev), priority);
 			if (strcmp(udev_device_get_devnode(dev), slink) == 0) {
@@ -316,14 +317,14 @@ static int update_link(struct udev_device *dev, const char *slink, int test)
 		}
 
 		/* another device, read priority from database */
-		dev_db = udev_device_new_from_syspath(udev, device->name);
+		dev_db = udev_device_new_from_syspath(udev, syspath);
 		if (dev_db == NULL)
 			continue;
 		devnode = udev_device_get_devnode(dev_db);
 		if (devnode != NULL) {
 			if (strcmp(devnode, slink) == 0) {
 				info(udev, "'%s' is a device node of '%s', skip link update\n",
-				     devnode, device->name);
+				     devnode, syspath);
 			} else {
 				info(udev, "compare priority of '%s' %i > %i\n",
 				     udev_device_get_devpath(dev_db),
@@ -337,7 +338,7 @@ static int update_link(struct udev_device *dev, const char *slink, int test)
 		}
 		udev_device_unref(dev_db);
 	}
-	name_list_cleanup(udev, &name_list);
+	udev_list_cleanup_entries(udev, &dev_list);
 
 	if (target[0] == '\0') {
 		info(udev, "no current target for '%s' found\n", slink);
@@ -348,7 +349,7 @@ static int update_link(struct udev_device *dev, const char *slink, int test)
 	/* create symlink to the target with the highest priority */
 	info(udev, "'%s' with target '%s' has the highest priority %i, create it\n", slink, target, priority);
 	if (!test) {
-		create_path(udev, slink);
+		util_create_path(udev, slink);
 		node_symlink(udev, target, slink);
 	}
 out:
@@ -389,49 +390,20 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev
 	}
 }
 
-int udev_node_add(struct udev_device *dev, mode_t mode, const char *owner, const char *group, int test)
+int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid, int test)
 {
 	struct udev *udev = udev_device_get_udev(dev);
-	uid_t uid;
-	gid_t gid;
 	int i;
 	int num;
 	struct udev_list_entry *list_entry;
 	int err = 0;
 
-	create_path(udev, udev_device_get_devnode(dev));
-
-	if (strcmp(owner, "root") == 0)
-		uid = 0;
-	else {
-		char *endptr;
-		unsigned long id;
-
-		id = strtoul(owner, &endptr, 10);
-		if (endptr[0] == '\0')
-			uid = (uid_t) id;
-		else
-			uid = lookup_user(udev, owner);
-	}
-
-	if (strcmp(group, "root") == 0)
-		gid = 0;
-	else {
-		char *endptr;
-		unsigned long id;
-
-		id = strtoul(group, &endptr, 10);
-		if (endptr[0] == '\0')
-			gid = (gid_t) id;
-		else
-			gid = lookup_group(udev, group);
-	}
-
 	info(udev, "creating device node '%s', devnum=%d:%d, mode=%#o, uid=%d, gid=%d\n",
 	     udev_device_get_devnode(dev),
 	     major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)),
 	     mode, uid, gid);
 
+	util_create_path(udev, udev_device_get_devnode(dev));
 	if (!test)
 		if (udev_node_mknod(dev, NULL, makedev(0,0), mode, uid, gid) != 0) {
 			err = -1;
@@ -502,7 +474,7 @@ extern int udev_node_remove(struct udev_device *dev, int test)
 
 	info(udev, "removing device node '%s'\n", devnode);
 	if (!test)
-		err = unlink_secure(udev, devnode);
+		err = util_unlink_secure(udev, devnode);
 	if (err)
 		return err;
 
@@ -517,9 +489,9 @@ extern int udev_node_remove(struct udev_device *dev, int test)
 			snprintf(partitionname, sizeof(partitionname), "%s%d", devnode, i);
 			partitionname[sizeof(partitionname)-1] = '\0';
 			if (!test)
-				unlink_secure(udev, partitionname);
+				util_unlink_secure(udev, partitionname);
 		}
 	}
-	delete_path(udev, devnode);
+	util_delete_path(udev, devnode);
 	return err;
 }