[PATCH] update udev scsi_id to scsi_id 0.3

[elogind.git] / udev-add.c

diff --git a/udev-add.c b/udev-add.c
index e64a845c7e3a4f8149cf3c17db39191f06283241..9aa8bdb3e91bb113edda18917ceef50a624424d4 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -37,6 +37,7 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -54,14 +55,14 @@
 static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
        int retval = -ENODEV;
-       char *dev;
+       struct sysfs_attribute *attr = NULL;
 
-       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'", dev);
+       dbg("dev='%s'", attr->value);
 
-       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);
 
@@ -100,6 +101,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;
@@ -140,6 +142,7 @@ static int create_node(struct udevice *dev)
        if (strrchr(dev->name, '/'))
                create_path(filename);
 
+       info("creating device node '%s'", filename);
        dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
        retval = mknod(filename, dev->mode, res);
        if (retval)
@@ -193,7 +196,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 +224,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 +255,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);