[PATCH] remove Makefile magic for klibc integration

[elogind.git] / udev_add.c

diff --git a/udev_add.c b/udev_add.c
index e5bd042a5c41bec14cb28b2f76ba03e83e998fff..e05710ce81f820638d90b1a3caa01c9938b3f385 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -34,9 +34,9 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
-#include <pwd.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_sysfs.h"
@@ -83,7 +83,6 @@ create:
 
        selinux_setfscreatecon(file, udev->kernel_name, mode);
        retval = mknod(file, mode, devt);
-       selinux_resetfscreatecon();
        if (retval != 0) {
                dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
                    file, mode, major(devt), minor(devt), strerror(errno));
@@ -114,12 +113,11 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 {
        char filename[NAME_SIZE];
        char partitionname[NAME_SIZE];
+       struct name_entry *name_loop;
        uid_t uid = 0;
        gid_t gid = 0;
        int tail;
-       char *pos;
-       int len;
-               int i;
+       int i;
 
        snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
        filename[NAME_SIZE-1] = '\0';
@@ -134,15 +132,8 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 
                if (endptr[0] == '\0')
                        uid = (uid_t) id;
-               else {
-                       struct passwd *pw;
-
-                       pw = getpwnam(udev->owner);
-                       if (pw == NULL)
-                               dbg("specified user unknown '%s'", udev->owner);
-                       else
-                               uid = pw->pw_uid;
-               }
+               else
+                       uid = lookup_user(udev->owner);
        }
 
        if (udev->group[0] != '\0') {
@@ -151,13 +142,8 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 
                if (endptr[0] == '\0')
                        gid = (gid_t) id;
-               else {
-                       struct group *gr = getgrnam(udev->group);
-                       if (gr == NULL)
-                               dbg("specified group unknown '%s'", udev->group);
-                       else
-                               gid = gr->gr_gid;
-               }
+               else
+                       gid = lookup_group(udev->group);
        }
 
        if (!udev->test_run) {
@@ -187,8 +173,8 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
                        for (i = 1; i <= udev->partitions; i++) {
                                dev_t part_devt;
 
-                               strfieldcpy(partitionname, filename);
-                               strintcat(partitionname, i);
+                               snprintf(partitionname, NAME_SIZE, "%s%d", filename, i);
+                               partitionname[NAME_SIZE-1] = '\0';
                                part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
                                udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
                        }
@@ -196,31 +182,28 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
        }
 
        /* create symlink(s) if requested */
-       foreach_strpart(udev->symlink, " ", pos, len) {
-               int retval;
-               char linkname[NAME_SIZE];
+       list_for_each_entry(name_loop, &udev->symlink_list, node) {
                char linktarget[NAME_SIZE];
 
-               strfieldcpymax(linkname, pos, len+1);
-               snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
+               snprintf(filename, NAME_SIZE, "%s/%s", udev_root, name_loop->name);
                filename[NAME_SIZE-1] = '\0';
 
                dbg("symlink '%s' to node '%s' requested", filename, udev->name);
                if (!udev->test_run)
-                       if (strrchr(linkname, '/'))
+                       if (strchr(filename, '/'))
                                create_path(filename);
 
                /* optimize relative link */
                linktarget[0] = '\0';
                i = 0;
                tail = 0;
-               while ((udev->name[i] == linkname[i]) && udev->name[i]) {
+               while (udev->name[i] && (udev->name[i] == name_loop->name[i])) {
                        if (udev->name[i] == '/')
                                tail = i+1;
                        i++;
                }
-               while (linkname[i] != '\0') {
-                       if (linkname[i] == '/')
+               while (name_loop->name[i] != '\0') {
+                       if (name_loop->name[i] == '/')
                                strfieldcat(linktarget, "../");
                        i++;
                }
@@ -229,11 +212,9 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 
                dbg("symlink(%s, %s)", linktarget, filename);
                if (!udev->test_run) {
-                       unlink(filename);
                        selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
-                       retval = symlink(linktarget, filename);
-                       selinux_resetfscreatecon();
-                       if (retval != 0)
+                       unlink(filename);
+                       if (symlink(linktarget, filename) != 0)
                                dbg("symlink(%s, %s) failed with error '%s'",
                                    linktarget, filename, strerror(errno));
                }
@@ -330,7 +311,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
        }
 
 exit:
-       selinux_exit();
+       selinux_restore();
 
        return retval;
 }