X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-node.c;h=e402dc9de38402334973b54187f7250c79e07304;hb=11ae7578505caa8df5604c6c86c82e9558439b30;hp=03b8d61fd0d411552c793e4ec87ea7bf2d46beb4;hpb=54808d77a3a62172fc6acbeec968be67c207509e;p=elogind.git

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 03b8d61fd..e402dc9de 100644
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -143,7 +143,7 @@ exit:
 static int node_symlink(struct udev *udev, const char *node, const char *slink)
 {
 	struct stat stats;
-	char target[UTIL_PATH_SIZE] = "";
+	char target[UTIL_PATH_SIZE];
 	char slink_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
 	int i = 0;
 	int tail = 0;
@@ -151,6 +151,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
 	int err = 0;
 
 	/* use relative link */
+	target[0] = '\0';
 	while (node[i] && (node[i] == slink[i])) {
 		if (node[i] == '/')
 			tail = i+1;
@@ -272,7 +273,7 @@ static int update_link(struct udev_device *dev, const char *slink, int test)
 	struct udev *udev = udev_device_get_udev(dev);
 	struct udev_list_node dev_list;
 	struct udev_list_entry *dev_entry;
-	char target[UTIL_PATH_SIZE] = "";
+	char target[UTIL_PATH_SIZE];
 	int count;
 	int priority = 0;
 	int rc = 0;
@@ -294,6 +295,7 @@ static int update_link(struct udev_device *dev, const char *slink, int test)
 	}
 
 	/* find the device with the highest priority */
+	target[0] = '\0';
 	udev_list_entry_foreach(dev_entry, udev_list_get_entry(&dev_list)) {
 		const char *syspath;
 		struct udev_device *dev_db;
@@ -390,49 +392,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;
 
-	util_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 = util_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 = util_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;