X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=e64a845c7e3a4f8149cf3c17db39191f06283241;hp=a71d435e327db824616935020e878faed987336f;hb=4763256c65859b94ac7a309cbb8f772d5426a08d;hpb=f7b4eca455c7dbf850d984892756f22dbd9ddc3d

diff --git a/udev-add.c b/udev-add.c
index a71d435e3..e64a845c7 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -36,6 +36,7 @@
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -53,18 +54,15 @@
 static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
 	int retval = -ENODEV;
-
 	char *dev;
 
 	dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
 	if (dev == NULL)
 		goto exit;
-
 	dbg("dev='%s'", dev);
 
 	if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
 		goto exit;
-
 	dbg("found major=%d, minor=%d", udev->major, udev->minor);
 
 	retval = 0;
@@ -72,17 +70,46 @@ exit:
 	return retval;
 }
 
-/*
- * we possibly want to add some symlinks here
- * only numeric owner/group id's are supported
- */
+static int create_path(char *file)
+{
+	char p[NAME_SIZE];
+	char *pos;
+	int retval;
+	struct stat stats;
+	
+	strncpy(p, file, sizeof(p));
+	pos = strchr(p+1, '/');
+	while (1) {
+		pos = strchr(pos+1, '/');
+		if (pos == NULL)
+			break;
+		*pos = 0x00;
+		if (stat(p, &stats)) {
+			retval = mkdir(p, 0755);
+			if (retval) {
+				dbg("mkdir(%s) failed with error '%s'",
+				    p, strerror(errno));
+				return retval;
+			}
+			dbg("created '%s'", p);
+		}
+		*pos = '/';
+	}
+	return 0;
+}
+
 static int create_node(struct udevice *dev)
 {
 	char filename[255];
+	char linktarget[255];
+	char *linkname;
+	char *symlinks;
 	int retval = 0;
 	uid_t uid = 0;
 	gid_t gid = 0;
 	dev_t res;
+	int i;
+	int tail;
 
 	strncpy(filename, udev_root, sizeof(filename));
 	strncat(filename, dev->name, sizeof(filename));
@@ -109,31 +136,9 @@ static int create_node(struct udevice *dev)
 		return -EINVAL;
 	}
 
-	/* create subdirectories if requested */
-	if (strchr(dev->name, '/')) {
-		char path[255];
-		char *pos;
-		struct stat stats;
-
-		strncpy(path, filename, sizeof(path));
-		pos = strchr(path+1, '/');
-		while (1) {
-			pos = strchr(pos+1, '/');
-			if (pos == NULL)
-				break;
-			*pos = 0x00;
-			if (stat(path, &stats)) {
-				retval = mkdir(path, 0755);
-				if (retval) {
-					dbg("mkdir(%s) failed with error '%s'",
-					    path, strerror(errno));
-					return retval;
-				}
-				dbg("created '%s'", path);
-			}
-			*pos = '/';
-		}
-	}
+	/* create parent directories if needed */
+	if (strrchr(dev->name, '/'))
+		create_path(filename);
 
 	dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
 	retval = mknod(filename, dev->mode, res);
@@ -179,8 +184,49 @@ static int create_node(struct udevice *dev)
 		dbg("chown(%s, %u, %u)", filename, uid, gid);
 		retval = chown(filename, uid, gid);
 		if (retval)
-			dbg("chown(%s, %u, %u) failed with error '%s'", filename,
-			    uid, gid, strerror(errno));
+			dbg("chown(%s, %u, %u) failed with error '%s'",
+			    filename, uid, gid, strerror(errno));
+	}
+
+	/* create symlink if requested */
+	if (*dev->symlink) {
+		symlinks = dev->symlink;
+		while (1) {
+			linkname = strsep(&symlinks, " ");
+			if (linkname == NULL)
+				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]);
+
+			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;
@@ -193,7 +239,6 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
 
 	strcpy(dev_path, sysfs_path);
 	strcat(dev_path, device_name);
-
 	dbg("looking at '%s'", dev_path);
 
 	/* open up the sysfs class device for this thing... */
@@ -278,6 +323,9 @@ int udev_add_device(char *path, char *subsystem)
 	dbg("name='%s'", dev.name);
 	retval = create_node(&dev);
 
+	if (retval == 0)
+		sysbus_send_create(&dev, path);
+
 exit:
 	if (class_dev)
 		sysfs_close_class_device(class_dev);