X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=aef755442fd3c4ecfab6d36489d65cb8c963a28e;hp=174331fadeae7318c24894e0fca79ace631d4e7b;hb=eddf1bca24d49055aa409315fd218561005fba07;hpb=5aebfbcb62614fc2bf2b1579d62e3fe272c6751a

diff --git a/udev-add.c b/udev-add.c
index 174331fad..aef755442 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -32,15 +32,20 @@
 #include <grp.h>
 #ifndef __KLIBC__
 #include <pwd.h>
+#include <utmp.h>
 #endif
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
 
+#define LOCAL_USER "$local"
+
 /* 
  * Right now the major/minor of a device is stored in a file called
  * "dev" in sysfs.
@@ -53,18 +58,15 @@
 static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
 	int retval = -ENODEV;
+	struct sysfs_attribute *attr = NULL;
 
-	char *dev;
-
-	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'", attr->value);
 
-	dbg("dev='%s'", dev);
-
-	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);
 
 	retval = 0;
@@ -79,7 +81,7 @@ static int create_path(char *file)
 	int retval;
 	struct stat stats;
 	
-	strncpy(p, file, sizeof(p));
+	strfieldcpy(p, file);
 	pos = strchr(p+1, '/');
 	while (1) {
 		pos = strchr(pos+1, '/');
@@ -88,7 +90,7 @@ static int create_path(char *file)
 		*pos = 0x00;
 		if (stat(p, &stats)) {
 			retval = mkdir(p, 0755);
-			if (retval) {
+			if (retval != 0) {
 				dbg("mkdir(%s) failed with error '%s'",
 				    p, strerror(errno));
 				return retval;
@@ -100,66 +102,103 @@ static int create_path(char *file)
 	return 0;
 }
 
-#ifdef USE_DBUS
-/** Send out a signal that a device node is created
- *
- *  @param  dev                 udevice object
- *  @param  path                Sysfs path of device
- */
-static void sysbus_send_create(struct udevice *dev, const char *path)
+static int make_node(char *filename, int major, int minor, unsigned int mode, uid_t uid, gid_t gid)
 {
-        char filename[255];
-        DBusMessage* message;
-        DBusMessageIter iter;
-
-        if (sysbus_connection == NULL)
-                return;
-
-        strncpy(filename, udev_root, sizeof(filename));
-        strncat(filename, dev->name, sizeof(filename));
-
-        /* object, interface, member */
-        message = dbus_message_new_signal("/org/kernel/udev/NodeMonitor", 
-                                          "org.kernel.udev.NodeMonitor",
-                                          "NodeCreated");
-        
-        dbus_message_iter_init(message, &iter);
-        dbus_message_iter_append_string(&iter, filename);
-        dbus_message_iter_append_string(&iter, path);
-
-        if ( !dbus_connection_send(sysbus_connection, message, NULL) )
-                dbg("error sending d-bus signal");
-
-        dbus_message_unref(message);
-        
-        dbus_connection_flush(sysbus_connection);
+	int retval;
+
+	retval = mknod(filename, mode, makedev(major, minor));
+	if (retval != 0) {
+		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+		    filename, mode, major, minor, strerror(errno));
+		return retval;
+	}
+
+	dbg("chmod(%s, %#o)", filename, mode);
+	retval = chmod(filename, mode);
+	if (retval != 0) {
+		dbg("chmod(%s, %#o) failed with error '%s'",
+		    filename, mode, strerror(errno));
+		return retval;
+	}
+
+	if (uid != 0 || gid != 0) {
+		dbg("chown(%s, %u, %u)", filename, uid, gid);
+		retval = chown(filename, uid, gid);
+		if (retval != 0) {
+			dbg("chown(%s, %u, %u) failed with error '%s'",
+			    filename, uid, gid, strerror(errno));
+			return retval;
+		}
+	}
+
+	return 0;
 }
-#endif /* USE_DBUS */
 
-/*
- * we possibly want to add some symlinks here
- * only numeric owner/group id's are supported
- */
-static int create_node(struct udevice *dev)
+/* get the local logged in user */
+static void set_to_local_user(char *user)
 {
-	char filename[255];
-	char linktarget[255];
+	struct utmp *u;
+	time_t recent = 0;
+
+	strfieldcpymax(user, default_owner_str, OWNER_SIZE);
+	setutent();
+	while (1) {
+		u = getutent();
+		if (u == NULL)
+			break;
+
+		/* is this a user login ? */
+		if (u->ut_type != USER_PROCESS)
+			continue;
+
+		/* is this a local login ? */
+		if (strcmp(u->ut_host, ""))
+			continue;
+
+		if (u->ut_time > recent) {
+			recent = u->ut_time;
+			strfieldcpymax(user, u->ut_user, OWNER_SIZE);
+			dbg("local user is '%s'", user);
+			break;
+		}
+	}
+	endutent();
+}
+
+/* Used to unlink existing files to ensure that our new file/symlink is created */
+static int unlink_entry(char *filename)
+{
+	struct stat stats;
+	int retval = 0;
+	
+	if (lstat(filename, &stats) == 0) {
+		if ((stats.st_mode & S_IFMT) != S_IFDIR) {
+			retval = unlink(filename);
+			if (retval) {
+				dbg("unlink(%s) failed with error '%s'",
+				    filename, strerror(errno));
+			}
+		}
+	}
+	return retval;
+}
+
+static int create_node(struct udevice *dev, int fake)
+{
+	char filename[NAME_SIZE];
+	char linkname[NAME_SIZE];
+	char linktarget[NAME_SIZE];
+	char partitionname[NAME_SIZE];
 	int retval = 0;
 	uid_t uid = 0;
 	gid_t gid = 0;
-	dev_t res;
 	int i;
 	int tail;
+	char *pos;
+	int len;
 
-
-	strncpy(filename, udev_root, sizeof(filename));
-	strncat(filename, dev->name, sizeof(filename));
-
-#ifdef __KLIBC__
-	res = (dev->major << 8) | (dev->minor);
-#else
-	res = makedev(dev->major, dev->minor);
-#endif
+	strfieldcpy(filename, udev_root);
+	strfieldcat(filename, dev->name);
 
 	switch (dev->type) {
 	case 'b':
@@ -181,87 +220,99 @@ static int create_node(struct udevice *dev)
 	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);
-	if (retval)
-		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
-		    filename, dev->mode, dev->major, dev->minor, strerror(errno));
-
-	dbg("chmod(%s, %#o)", filename, dev->mode);
-	retval = chmod(filename, dev->mode);
-	if (retval)
-		dbg("chmod(%s, %#o) failed with error '%s'",
-		    filename, dev->mode, strerror(errno));
-
-	if (*dev->owner) {
+	if (dev->owner[0] != '\0') {
 		char *endptr;
 		unsigned long id = strtoul(dev->owner, &endptr, 10);
-		if (*endptr == 0x00)
+		if (endptr[0] == '\0')
 			uid = (uid_t) id;
 		else {
-			struct passwd *pw = getpwnam(dev->owner);
-			if (!pw)
-				dbg("user unknown '%s'", dev->owner);
+			struct passwd *pw;
+			if (strncmp(dev->owner, LOCAL_USER, sizeof(LOCAL_USER)) == 0)
+				set_to_local_user(dev->owner);
+
+			pw = getpwnam(dev->owner);
+			if (pw == NULL)
+				dbg("specified user unknown '%s'", dev->owner);
 			else
 				uid = pw->pw_uid;
 		}
 	}
 
-	if (*dev->group) {
+	if (dev->group[0] != '\0') {
 		char *endptr;
 		unsigned long id = strtoul(dev->group, &endptr, 10);
-		if (*endptr == 0x00)
+		if (endptr[0] == '\0')
 			gid = (gid_t) id;
 		else {
 			struct group *gr = getgrnam(dev->group);
-			if (!gr)
-				dbg("group unknown '%s'", dev->group);
+			if (gr == NULL)
+				dbg("specified group unknown '%s'", dev->group);
 			else
 				gid = gr->gr_gid;
 		}
 	}
 
-	if (uid || gid) {
-		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));
+	if (!fake) {
+		unlink_entry(filename);
+		info("creating device node '%s'", filename);
+		make_node(filename, dev->major, dev->minor, dev->mode, uid, gid);
+	} else {
+		info("creating device node '%s', major = '%d', minor = '%d', "
+		     "mode = '%#o', uid = '%d', gid = '%d'", filename,
+		     dev->major, dev->minor, (mode_t)dev->mode, uid, gid);
 	}
 
+	/* create partitions if requested */
+	if (dev->partitions > 0) {
+		info("creating device partition nodes '%s[1-%i]'", filename, dev->partitions);
+		if (!fake) {
+			for (i = 1; i <= dev->partitions; i++) {
+				strfieldcpy(partitionname, filename);
+				strintcat(partitionname, i);
+				unlink_entry(partitionname);
+				make_node(partitionname, dev->major,
+					  dev->minor + i, dev->mode, uid, gid);
+			}
+		}
+	}
 
 	/* create symlink if requested */
-	if (*dev->symlink) {
-		strncpy(filename, udev_root, sizeof(filename));
-		strncat(filename, dev->symlink, sizeof(filename));
+	foreach_strpart(dev->symlink, " ", pos, len) {
+		strfieldcpymax(linkname, pos, len+1);
+		strfieldcpy(filename, udev_root);
+		strfieldcat(filename, linkname);
 		dbg("symlink '%s' to node '%s' requested", filename, dev->name);
-		if (strrchr(dev->symlink, '/'))
-			create_path(filename);
+		if (!fake)
+			if (strrchr(linkname, '/'))
+				create_path(filename);
 
 		/* optimize relative link */
 		linktarget[0] = '\0';
 		i = 0;
 		tail = 0;
-		while ((dev->name[i] == dev->symlink[i]) && dev->name[i]) {
+		while ((dev->name[i] == linkname[i]) && dev->name[i]) {
 			if (dev->name[i] == '/')
 				tail = i+1;
 			i++;
 		}
-		while (dev->symlink[i]) {
-			if (dev->symlink[i] == '/')
-				strcat(linktarget, "../");
+		while (linkname[i] != '\0') {
+			if (linkname[i] == '/')
+				strfieldcat(linktarget, "../");
 			i++;
 		}
 
-		if (*linktarget == '\0')
-			strcpy(linktarget, "./");
-		strcat(linktarget, &dev->name[tail]);
+		strfieldcat(linktarget, &dev->name[tail]);
+
+		if (!fake)
+			unlink_entry(filename);
 
 		dbg("symlink(%s, %s)", linktarget, filename);
-		retval = symlink(linktarget, filename);
-		if (retval)
-			dbg("symlink(%s, %s) failed with error '%s'",
-			    linktarget, filename, strerror(errno));
+		if (!fake) {
+			retval = symlink(linktarget, filename);
+			if (retval != 0)
+				dbg("symlink(%s, %s) failed with error '%s'",
+				    linktarget, filename, strerror(errno));
+		}
 	}
 
 	return retval;
@@ -272,15 +323,14 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
 	char dev_path[SYSFS_PATH_MAX];
 	struct sysfs_class_device *class_dev = NULL;
 
-	strcpy(dev_path, sysfs_path);
-	strcat(dev_path, device_name);
-
+	strfieldcpy(dev_path, sysfs_path);
+	strfieldcat(dev_path, 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);
@@ -299,16 +349,16 @@ static int sleep_for_dev(char *path)
 	int loop = SECONDS_TO_WAIT_FOR_DEV;
 	int retval;
 
-	strcpy(filename, sysfs_path);
-	strcat(filename, path);
-	strcat(filename, "/dev");
+	strfieldcpy(filename, sysfs_path);
+	strfieldcat(filename, path);
+	strfieldcat(filename, "/dev");
 
 	while (loop--) {
 		struct stat buf;
 
 		dbg("looking for '%s'", filename);
 		retval = stat(filename, &buf);
-		if (!retval)
+		if (retval == 0)
 			goto exit;
 
 		/* sleep to give the kernel a chance to create the dev file */
@@ -319,7 +369,7 @@ exit:
 	return retval;
 }
 
-int udev_add_device(char *path, char *subsystem)
+int udev_add_device(char *path, char *subsystem, int fake)
 {
 	struct sysfs_class_device *class_dev = NULL;
 	struct udevice dev;
@@ -334,7 +384,7 @@ int udev_add_device(char *path, char *subsystem)
 		dev.type = 'c';
 
 	retval = sleep_for_dev(path);
-	if (retval)
+	if (retval != 0)
 		goto exit;
 
 	class_dev = get_class_dev(path);
@@ -342,28 +392,28 @@ int udev_add_device(char *path, char *subsystem)
 		goto exit;
 
 	retval = get_major_minor(class_dev, &dev);
-	if (retval) {
+	if (retval != 0) {
 		dbg("get_major_minor failed");
 		goto exit;
 	}
 
 	retval = namedev_name_device(class_dev, &dev);
-	if (retval)
+	if (retval != 0)
 		goto exit;
 
-	retval = udevdb_add_dev(path, &dev);
-	if (retval != 0)
-		dbg("udevdb_add_dev failed, but we are going to try to create the node anyway. "
-		    "But remove might not work properly for this device.");
+	if (!fake) {
+		retval = udevdb_add_dev(path, &dev);
+		if (retval != 0)
+			dbg("udevdb_add_dev failed, but we are going to try "
+			    "to create the node anyway. But remove might not "
+			    "work properly for this device.");
 
+	}
 	dbg("name='%s'", dev.name);
-	retval = create_node(&dev);
+	retval = create_node(&dev, fake);
 
-#ifdef USE_DBUS
-        if (retval == 0) {
-                sysbus_send_create(&dev, path);
-        }
-#endif /* USE_DBUS */
+	if ((retval == 0) && (!fake))
+		dev_d_send(&dev, subsystem);
 
 exit:
 	if (class_dev)