X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=802d85b5b07d408fe612b41398b2416abc061a73;hp=33ee633fd8765a5fdf0d87a5b87bbb5dfa12c102;hb=c38b796be9ff453903db7b4813f69323b6422695;hpb=5d4754f19521568b775ba7a31465d3af192ce382

diff --git a/udev-add.c b/udev-add.c
index 33ee633fd..802d85b5b 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -100,6 +100,7 @@ static int create_path(char *file)
 
 static int create_node(struct udevice *dev)
 {
+	struct stat stats;
 	char filename[255];
 	char linktarget[255];
 	char *linkname;
@@ -193,7 +194,7 @@ static int create_node(struct udevice *dev)
 		symlinks = dev->symlink;
 		while (1) {
 			linkname = strsep(&symlinks, " ");
-			if (linkname == NULL)
+			if (linkname == NULL || linkname[0] == '\0')
 				break;
 
 			strncpy(filename, udev_root, sizeof(filename));
@@ -221,6 +222,16 @@ static int create_node(struct udevice *dev)
 				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)
@@ -242,9 +253,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);