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=9562cb5dbbc5de2ab956fc0352e2f1915b81b5a8;hb=b528cd49203c64cf117868b5a5907cb11d934bbb;hpb=5895eb31fe86619a9d9070e12bc0c970da9daf6b

diff --git a/udev-add.c b/udev-add.c
index 9562cb5db..aef755442 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -37,9 +37,8 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
-#include "udev_selinux.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -141,7 +140,7 @@ static void set_to_local_user(char *user)
 	struct utmp *u;
 	time_t recent = 0;
 
-	strnfieldcpy(user, default_owner_str, OWNER_SIZE);
+	strfieldcpymax(user, default_owner_str, OWNER_SIZE);
 	setutent();
 	while (1) {
 		u = getutent();
@@ -158,7 +157,7 @@ static void set_to_local_user(char *user)
 
 		if (u->ut_time > recent) {
 			recent = u->ut_time;
-			strnfieldcpy(user, u->ut_user, OWNER_SIZE);
+			strfieldcpymax(user, u->ut_user, OWNER_SIZE);
 			dbg("local user is '%s'", user);
 			break;
 		}
@@ -195,7 +194,8 @@ static int create_node(struct udevice *dev, int fake)
 	gid_t gid = 0;
 	int i;
 	int tail;
-	int pos, len;
+	char *pos;
+	int len;
 
 	strfieldcpy(filename, udev_root);
 	strfieldcat(filename, dev->name);
@@ -276,12 +276,9 @@ static int create_node(struct udevice *dev, int fake)
 		}
 	}
 
-	if (!fake)
-		selinux_add_node(filename);
-
 	/* create symlink if requested */
 	foreach_strpart(dev->symlink, " ", pos, len) {
-		strnfieldcpy(linkname, dev->symlink + pos, len+1);
+		strfieldcpymax(linkname, pos, len+1);
 		strfieldcpy(filename, udev_root);
 		strfieldcat(filename, linkname);
 		dbg("symlink '%s' to node '%s' requested", filename, dev->name);
@@ -416,7 +413,7 @@ int udev_add_device(char *path, char *subsystem, int fake)
 	retval = create_node(&dev, fake);
 
 	if ((retval == 0) && (!fake))
-		sysbus_send_create(&dev, path);
+		dev_d_send(&dev, subsystem);
 
 exit:
 	if (class_dev)