[PATCH] udev - kill udevd on install

[elogind.git] / udev-add.c

diff --git a/udev-add.c b/udev-add.c
index 8867c8f5afc2ee5d6e125df73ea6a2ce4fa1a08b..3a72c544b8b9b20af53c61153c6b4e3aee579bda 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -34,13 +34,14 @@
 #include <pwd.h>
 #endif
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
+#include "udev_selinux.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
 
 /* 
@@ -78,7 +79,7 @@ static int create_path(char *file)
        int retval;
        struct stat stats;
        
-       strncpy(p, file, sizeof(p));
+       strfieldcpy(p, file);
        pos = strchr(p+1, '/');
        while (1) {
                pos = strchr(pos+1, '/');
@@ -99,11 +100,44 @@ static int create_path(char *file)
        return 0;
 }
 
+static int make_node(char *filename, int major, int minor, unsigned int mode, uid_t uid, gid_t gid)
+{
+       int retval;
+
+       retval = mknod(filename, mode, makedev(major, minor));
+       if (retval != 0) {
+               dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+                   filename, mode, major, minor, strerror(errno));
+               return retval;
+       }
+
+       dbg("chmod(%s, %#o)", filename, mode);
+       retval = chmod(filename, mode);
+       if (retval != 0) {
+               dbg("chmod(%s, %#o) failed with error '%s'",
+                   filename, mode, strerror(errno));
+               return retval;
+       }
+
+       if (uid != 0 || gid != 0) {
+               dbg("chown(%s, %u, %u)", filename, uid, gid);
+               retval = chown(filename, uid, gid);
+               if (retval != 0) {
+                       dbg("chown(%s, %u, %u) failed with error '%s'",
+                           filename, uid, gid, strerror(errno));
+                       return retval;
+               }
+       }
+
+       return 0;
+}
+
 static int create_node(struct udevice *dev, int fake)
 {
        struct stat stats;
        char filename[255];
        char linktarget[255];
+       char partitionname[255];
        char *linkname;
        char *symlinks;
        int retval = 0;
@@ -112,8 +146,8 @@ static int create_node(struct udevice *dev, int fake)
        int i;
        int tail;
 
-       strncpy(filename, udev_root, sizeof(filename));
-       strncat(filename, dev->name, sizeof(filename));
+       strfieldcpy(filename, udev_root);
+       strfieldcat(filename, dev->name);
 
        switch (dev->type) {
        case 'b':
@@ -135,23 +169,6 @@ static int create_node(struct udevice *dev, int fake)
        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);
-       if (!fake) {
-               retval = mknod(filename, dev->mode, makedev(dev->major, dev->minor));
-               if (retval != 0)
-                       dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
-                           filename, dev->mode, dev->major, dev->minor, strerror(errno));
-       }
-
-       dbg("chmod(%s, %#o)", filename, dev->mode);
-       if (!fake) {
-               retval = chmod(filename, dev->mode);
-               if (retval != 0)
-                       dbg("chmod(%s, %#o) failed with error '%s'",
-                           filename, dev->mode, strerror(errno));
-       }
-
        if (dev->owner[0] != '\0') {
                char *endptr;
                unsigned long id = strtoul(dev->owner, &endptr, 10);
@@ -180,14 +197,31 @@ static int create_node(struct udevice *dev, int fake)
                }
        }
 
-       if (uid != 0 || gid != 0) {
-               dbg("chown(%s, %u, %u)", filename, uid, gid);
-               retval = chown(filename, uid, gid);
-               if (retval != 0)
-                       dbg("chown(%s, %u, %u) failed with error '%s'",
-                           filename, uid, gid, strerror(errno));
+       if (!fake) {
+               info("creating device node '%s'", filename);
+               make_node(filename, dev->major, dev->minor, dev->mode, uid, gid);
+       } else {
+               info("creating device node '%s', major = '%d', minor = '%d', "
+                    "mode = '%#o', uid = '%d', gid = '%d'", filename,
+                    dev->major, dev->minor, (mode_t)dev->mode, uid, gid);
        }
 
+       /* create partitions if requested */
+       if (dev->partitions > 0) {
+               info("creating device partition nodes '%s[1-%i]'", filename, dev->partitions);
+               if (!fake) {
+                       for (i = 1; i <= dev->partitions; i++) {
+                               strfieldcpy(partitionname, filename);
+                               strintcat(partitionname, i);
+                               make_node(partitionname, dev->major,
+                                         dev->minor + i, dev->mode, uid, gid);
+                       }
+               }
+       }
+
+       if (!fake)
+               selinux_add_node(filename);
+
        /* create symlink if requested */
        if (dev->symlink[0] != '\0') {
                symlinks = dev->symlink;
@@ -196,8 +230,8 @@ static int create_node(struct udevice *dev, int fake)
                        if (linkname == NULL || linkname[0] == '\0')
                                break;
 
-                       strncpy(filename, udev_root, sizeof(filename));
-                       strncat(filename, linkname, sizeof(filename));
+                       strfieldcpy(filename, udev_root);
+                       strfieldcat(filename, linkname);
                        dbg("symlink '%s' to node '%s' requested", filename, dev->name);
                        if (!fake)
                                if (strrchr(linkname, '/'))
@@ -214,16 +248,13 @@ static int create_node(struct udevice *dev, int fake)
                        }
                        while (linkname[i] != '\0') {
                                if (linkname[i] == '/')
-                                       strcat(linktarget, "../");
+                                       strfieldcat(linktarget, "../");
                                i++;
                        }
 
-                       if (linktarget[0] == '\0')
-                               strcpy(linktarget, "./");
-                       strcat(linktarget, &dev->name[tail]);
+                       strfieldcat(linktarget, &dev->name[tail]);
 
-                       /* unlink existing non-directories to ensure that our symlink
-                        * is created */
+                       /* unlink existing files to ensure that our symlink is created */
                        if (!fake && (lstat(filename, &stats) == 0)) {
                                if ((stats.st_mode & S_IFMT) != S_IFDIR) {
                                        if (unlink(filename))
@@ -250,8 +281,8 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
        char dev_path[SYSFS_PATH_MAX];
        struct sysfs_class_device *class_dev = NULL;
 
-       strcpy(dev_path, sysfs_path);
-       strcat(dev_path, device_name);
+       strfieldcpy(dev_path, sysfs_path);
+       strfieldcat(dev_path, device_name);
        dbg("looking at '%s'", dev_path);
 
        /* open up the sysfs class device for this thing... */
@@ -276,9 +307,9 @@ static int sleep_for_dev(char *path)
        int loop = SECONDS_TO_WAIT_FOR_DEV;
        int retval;
 
-       strcpy(filename, sysfs_path);
-       strcat(filename, path);
-       strcat(filename, "/dev");
+       strfieldcpy(filename, sysfs_path);
+       strfieldcat(filename, path);
+       strfieldcat(filename, "/dev");
 
        while (loop--) {
                struct stat buf;