X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=9aa8bdb3e91bb113edda18917ceef50a624424d4;hp=17b69eadabc620abde5b12b817801f306b8668b1;hb=e996d97835c8d0728a9d4880e9e1f8f285cadf4b;hpb=c6c13c31814e9fc7557ca303c331d0cf13664372

diff --git a/udev-add.c b/udev-add.c
index 17b69eada..9aa8bdb3e 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -37,6 +37,7 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -54,14 +55,14 @@
 static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
 	int retval = -ENODEV;
-	char *dev;
+	struct sysfs_attribute *attr = NULL;
 
-	dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
-	if (dev == NULL)
+	attr = sysfs_get_classdev_attr(class_dev, "dev");
+	if (attr == NULL)
 		goto exit;
-	dbg("dev='%s'", dev);
+	dbg("dev='%s'", attr->value);
 
-	if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
+	if (sscanf(attr->value, "%u:%u", &udev->major, &udev->minor) != 2)
 		goto exit;
 	dbg("found major=%d, minor=%d", udev->major, udev->minor);
 
@@ -100,8 +101,11 @@ static int create_path(char *file)
 
 static int create_node(struct udevice *dev)
 {
+	struct stat stats;
 	char filename[255];
 	char linktarget[255];
+	char *linkname;
+	char *symlinks;
 	int retval = 0;
 	uid_t uid = 0;
 	gid_t gid = 0;
@@ -138,6 +142,7 @@ static int create_node(struct udevice *dev)
 	if (strrchr(dev->name, '/'))
 		create_path(filename);
 
+	info("creating device node '%s'", filename);
 	dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
 	retval = mknod(filename, dev->mode, res);
 	if (retval)
@@ -186,39 +191,55 @@ static int create_node(struct udevice *dev)
 			    filename, uid, gid, strerror(errno));
 	}
 
-
 	/* create symlink if requested */
 	if (*dev->symlink) {
-		strncpy(filename, udev_root, sizeof(filename));
-		strncat(filename, dev->symlink, sizeof(filename));
-		dbg("symlink '%s' to node '%s' requested", filename, dev->name);
-		if (strrchr(dev->symlink, '/'))
-			create_path(filename);
-
-		/* optimize relative link */
-		linktarget[0] = '\0';
-		i = 0;
-		tail = 0;
-		while ((dev->name[i] == dev->symlink[i]) && dev->name[i]) {
-			if (dev->name[i] == '/')
-				tail = i+1;
-			i++;
-		}
-		while (dev->symlink[i]) {
-			if (dev->symlink[i] == '/')
-				strcat(linktarget, "../");
-			i++;
-		}
+		symlinks = dev->symlink;
+		while (1) {
+			linkname = strsep(&symlinks, " ");
+			if (linkname == NULL || linkname[0] == '\0')
+				break;
+
+			strncpy(filename, udev_root, sizeof(filename));
+			strncat(filename, linkname, sizeof(filename));
+			dbg("symlink '%s' to node '%s' requested", filename, dev->name);
+			if (strrchr(linkname, '/'))
+				create_path(filename);
+
+			/* optimize relative link */
+			linktarget[0] = '\0';
+			i = 0;
+			tail = 0;
+			while ((dev->name[i] == linkname[i]) && dev->name[i]) {
+				if (dev->name[i] == '/')
+					tail = i+1;
+				i++;
+			}
+			while (linkname[i]) {
+				if (linkname[i] == '/')
+					strcat(linktarget, "../");
+				i++;
+			}
 
-		if (*linktarget == '\0')
-			strcpy(linktarget, "./");
-		strcat(linktarget, &dev->name[tail]);
+			if (*linktarget == '\0')
+				strcpy(linktarget, "./");
+			strcat(linktarget, &dev->name[tail]);
+
+			/* unlink existing non-directories to ensure that our symlink
+			 * is created */
+			if (lstat(filename, &stats) == 0) {
+				if ((stats.st_mode & S_IFMT) != S_IFDIR) {
+					if (unlink(filename))
+						dbg("unlink(%s) failed with error '%s'",
+						    filename, strerror(errno));
+				}
+			}
 
-		dbg("symlink(%s, %s)", linktarget, filename);
-		retval = symlink(linktarget, filename);
-		if (retval)
-			dbg("symlink(%s, %s) failed with error '%s'",
-			    linktarget, filename, strerror(errno));
+			dbg("symlink(%s, %s)", linktarget, filename);
+			retval = symlink(linktarget, filename);
+			if (retval)
+				dbg("symlink(%s, %s) failed with error '%s'",
+				    linktarget, filename, strerror(errno));
+		}
 	}
 
 	return retval;
@@ -234,9 +255,9 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
 	dbg("looking at '%s'", dev_path);
 
 	/* open up the sysfs class device for this thing... */
-	class_dev = sysfs_open_class_device(dev_path);
+	class_dev = sysfs_open_class_device_path(dev_path);
 	if (class_dev == NULL) {
-		dbg ("sysfs_open_class_device failed");
+		dbg ("sysfs_open_class_device_path failed");
 		goto exit;
 	}
 	dbg("class_dev->name='%s'", class_dev->name);