X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_add.c;h=f537f567ccdfb36c034af288cc26841f9191d9d7;hp=809a33cedb664f7f4dafab1dde562982e85ccdef;hb=97adaace4f8f89ce175657d3ec71811715cc4dae;hpb=5d24c6ca364c6232efa626049b03d02c15ab5e85

diff --git a/udev_add.c b/udev_add.c
index 809a33ced..f537f567c 100644
--- a/udev_add.c
+++ b/udev_add.c
@@ -34,21 +34,15 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
-#ifndef __KLIBC__
 #include <pwd.h>
-#include <utmp.h>
-#endif
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
-#include "klibc_fixups.h"
-
-#define LOCAL_USER "$local"
+#include "udev_db.h"
 
 #include "selinux.h"
 
@@ -74,37 +68,6 @@ error:
 	return -1;
 }
 
-static int create_path(char *file)
-{
-	char p[NAME_SIZE];
-	char *pos;
-	int retval;
-	struct stat stats;
-	
-	strfieldcpy(p, file);
-	pos = strchr(p+1, '/');
-	while (1) {
-		pos = strchr(pos+1, '/');
-		if (pos == NULL)
-			break;
-		*pos = 0x00;
-		if (stat(p, &stats)) {
-			selinux_setfscreatecon(p, S_IFDIR);
-			retval = mkdir(p, 0755);
-			if (retval != 0) {
-				dbg("mkdir(%s) failed with error '%s'",
-				    p, strerror(errno));
-				return retval;
-			}
-			dbg("created '%s'", p);
-		} else {
-			selinux_setfilecon(p, S_IFDIR);
-		}
-		*pos = '/';
-	}
-	return 0;
-}
-
 static int make_node(char *file, int major, int minor, unsigned int mode, uid_t uid, gid_t gid)
 {
 	struct stat stats;
@@ -155,42 +118,9 @@ exit:
 	return retval;
 }
 
-/* get the local logged in user */
-static void set_to_local_user(char *user)
-{
-	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();
-}
-
 static int create_node(struct udevice *udev)
 {
 	char filename[NAME_SIZE];
-	char linkname[NAME_SIZE];
-	char linktarget[NAME_SIZE];
 	char partitionname[NAME_SIZE];
 	uid_t uid = 0;
 	gid_t gid = 0;
@@ -199,8 +129,8 @@ static int create_node(struct udevice *udev)
 	char *pos;
 	int len;
 
-	strfieldcpy(filename, udev_root);
-	strfieldcat(filename, udev->name);
+	snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
+	filename[NAME_SIZE-1] = '\0';
 
 	switch (udev->type) {
 	case 'b':
@@ -229,8 +159,6 @@ static int create_node(struct udevice *udev)
 			uid = (uid_t) id;
 		else {
 			struct passwd *pw;
-			if (strncmp(udev->owner, LOCAL_USER, sizeof(LOCAL_USER)) == 0)
-				set_to_local_user(udev->owner);
 
 			pw = getpwnam(udev->owner);
 			if (pw == NULL)
@@ -278,9 +206,13 @@ static int create_node(struct udevice *udev)
 
 	/* create symlink(s) if requested */
 	foreach_strpart(udev->symlink, " ", pos, len) {
+		char linkname[NAME_SIZE];
+		char linktarget[NAME_SIZE];
+
 		strfieldcpymax(linkname, pos, len+1);
-		strfieldcpy(filename, udev_root);
-		strfieldcat(filename, linkname);
+		snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
+		filename[NAME_SIZE-1] = '\0';
+
 		dbg("symlink '%s' to node '%s' requested", filename, udev->name);
 		if (!udev->test_run)
 			if (strrchr(linkname, '/'))
@@ -371,12 +303,13 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 		if (retval != 0)
 			goto exit;
 
-		if (udevdb_add_dev(udev) != 0)
-			dbg("udevdb_add_dev failed, but we create the node anyway, "
+		if (udev_db_add_device(udev) != 0)
+			dbg("udev_db_add_dev failed, but we create the node anyway, "
 			    "remove might not work for custom names");
 
 		/* use full path to the environment */
-		snprintf(udev->devname, NAME_SIZE-1, "%s%s", udev_root, udev->name);
+		snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
+		udev->devname[NAME_SIZE-1] = '\0';
 
 	} else if (udev->type == 'n') {
 		/* look if we want to change the name of the netif */