[PATCH] minor grammer fixes for the udev_vs_devfs document

[elogind.git] / udev-add.c

diff --git a/udev-add.c b/udev-add.c
index 17b69eadabc620abde5b12b817801f306b8668b1..802d85b5b07d408fe612b41398b2416abc061a73 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -54,14 +54,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,8 +100,11 @@ static int create_path(char *file)
 
 static int create_node(struct udevice *dev)
 {
+       struct stat stats;
        char filename[255];
        char linktarget[255];
+       char *linkname;
+       char *symlinks;
        int retval = 0;
        uid_t uid = 0;
        gid_t gid = 0;
@@ -186,39 +189,55 @@ static int create_node(struct udevice *dev)
                            filename, uid, gid, strerror(errno));
        }
 
-
        /* create symlink if requested */
        if (*dev->symlink) {
-               strncpy(filename, udev_root, sizeof(filename));
-               strncat(filename, dev->symlink, sizeof(filename));
-               dbg("symlink '%s' to node '%s' requested", filename, dev->name);
-               if (strrchr(dev->symlink, '/'))
-                       create_path(filename);
-
-               /* optimize relative link */
-               linktarget[0] = '\0';
-               i = 0;
-               tail = 0;
-               while ((dev->name[i] == dev->symlink[i]) && dev->name[i]) {
-                       if (dev->name[i] == '/')
-                               tail = i+1;
-                       i++;
-               }
-               while (dev->symlink[i]) {
-                       if (dev->symlink[i] == '/')
-                               strcat(linktarget, "../");
-                       i++;
-               }
+               symlinks = dev->symlink;
+               while (1) {
+                       linkname = strsep(&symlinks, " ");
+                       if (linkname == NULL || linkname[0] == '\0')
+                               break;
+
+                       strncpy(filename, udev_root, sizeof(filename));
+                       strncat(filename, linkname, sizeof(filename));
+                       dbg("symlink '%s' to node '%s' requested", filename, dev->name);
+                       if (strrchr(linkname, '/'))
+                               create_path(filename);
+
+                       /* optimize relative link */
+                       linktarget[0] = '\0';
+                       i = 0;
+                       tail = 0;
+                       while ((dev->name[i] == linkname[i]) && dev->name[i]) {
+                               if (dev->name[i] == '/')
+                                       tail = i+1;
+                               i++;
+                       }
+                       while (linkname[i]) {
+                               if (linkname[i] == '/')
+                                       strcat(linktarget, "../");
+                               i++;
+                       }
 
-               if (*linktarget == '\0')
-                       strcpy(linktarget, "./");
-               strcat(linktarget, &dev->name[tail]);
+                       if (*linktarget == '\0')
+                               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)
-                       dbg("symlink(%s, %s) failed with error '%s'",
-                           linktarget, filename, strerror(errno));
+                       dbg("symlink(%s, %s)", linktarget, filename);
+                       retval = symlink(linktarget, filename);
+                       if (retval)
+                               dbg("symlink(%s, %s) failed with error '%s'",
+                                   linktarget, filename, strerror(errno));
+               }
        }
 
        return retval;
@@ -234,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);