libudev: device - add get_parent_with_subsystem()

[elogind.git] / udev / udev_node.c

diff --git a/udev/udev_node.c b/udev/udev_node.c
index 0319b2f875e07834b7a45206c393f17867616813..a43e5bd63fee6ecbeb8f35156774eddc2847274e 100644 (file)
--- a/udev/udev_node.c
+++ b/udev/udev_node.c
@@ -34,7 +34,7 @@
 
 int udev_node_mknod(struct udevice *udevice, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid)
 {
-       char file_tmp[PATH_SIZE + sizeof(TMP_FILE_EXT)];
+       char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
        struct stat stats;
        int preserve = 0;
        int err = 0;
@@ -58,13 +58,13 @@ int udev_node_mknod(struct udevice *udevice, const char *file, dev_t devt, mode_
                        err = mknod(file_tmp, mode, devt);
                        udev_selinux_resetfscreatecon(udevice->udev);
                        if (err != 0) {
-                               err(udevice->udev, "mknod(%s, %#o, %u, %u) failed: %s\n",
-                                   file_tmp, mode, major(devt), minor(devt), strerror(errno));
+                               err(udevice->udev, "mknod(%s, %#o, %u, %u) failed: %m\n",
+                                   file_tmp, mode, major(devt), minor(devt));
                                goto exit;
                        }
                        err = rename(file_tmp, file);
                        if (err != 0) {
-                               err(udevice->udev, "rename(%s, %s) failed: %s\n", file_tmp, file, strerror(errno));
+                               err(udevice->udev, "rename(%s, %s) failed: %m\n", file_tmp, file);
                                unlink(file_tmp);
                        }
                }
@@ -74,8 +74,8 @@ int udev_node_mknod(struct udevice *udevice, const char *file, dev_t devt, mode_
                err = mknod(file, mode, devt);
                udev_selinux_resetfscreatecon(udevice->udev);
                if (err != 0) {
-                       err(udevice->udev, "mknod(%s, %#o, (%u,%u) failed: %s\n",
-                           file, mode, major(devt), minor(devt), strerror(errno));
+                       err(udevice->udev, "mknod(%s, %#o, (%u,%u) failed: %m\n",
+                           file, mode, major(devt), minor(devt));
                        goto exit;
                }
        }
@@ -84,7 +84,7 @@ int udev_node_mknod(struct udevice *udevice, const char *file, dev_t devt, mode_
                info(udevice->udev, "chmod(%s, %#o)\n", file, mode);
                err = chmod(file, mode);
                if (err != 0) {
-                       err(udevice->udev, "chmod(%s, %#o) failed: %s\n", file, mode, strerror(errno));
+                       err(udevice->udev, "chmod(%s, %#o) failed: %m\n", file, mode);
                        goto exit;
                }
        }
@@ -93,7 +93,7 @@ int udev_node_mknod(struct udevice *udevice, const char *file, dev_t devt, mode_
                info(udevice->udev, "chown(%s, %u, %u)\n", file, uid, gid);
                err = chown(file, uid, gid);
                if (err != 0) {
-                       err(udevice->udev, "chown(%s, %u, %u) failed: %s\n", file, uid, gid, strerror(errno));
+                       err(udevice->udev, "chown(%s, %u, %u) failed: %m\n", file, uid, gid);
                        goto exit;
                }
        }
@@ -104,8 +104,8 @@ exit:
 static int node_symlink(struct udevice *udevice, const char *node, const char *slink)
 {
        struct stat stats;
-       char target[PATH_SIZE] = "";
-       char slink_tmp[PATH_SIZE + sizeof(TMP_FILE_EXT)];
+       char target[UTIL_PATH_SIZE] = "";
+       char slink_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
        int i = 0;
        int tail = 0;
        int len;
@@ -140,7 +140,7 @@ static int node_symlink(struct udevice *udevice, const char *node, const char *s
                                }
                        }
                } else if (S_ISLNK(stats.st_mode)) {
-                       char buf[PATH_SIZE];
+                       char buf[UTIL_PATH_SIZE];
 
                        info(udevice->udev, "found existing symlink '%s'\n", slink);
                        len = readlink(slink, buf, sizeof(buf));
@@ -170,12 +170,12 @@ static int node_symlink(struct udevice *udevice, const char *node, const char *s
        retval = symlink(target, slink_tmp);
        udev_selinux_resetfscreatecon(udevice->udev);
        if (retval != 0) {
-               err(udevice->udev, "symlink(%s, %s) failed: %s\n", target, slink_tmp, strerror(errno));
+               err(udevice->udev, "symlink(%s, %s) failed: %m\n", target, slink_tmp);
                goto exit;
        }
        retval = rename(slink_tmp, slink);
        if (retval != 0) {
-               err(udevice->udev, "rename(%s, %s) failed: %s\n", slink_tmp, slink, strerror(errno));
+               err(udevice->udev, "rename(%s, %s) failed: %m\n", slink_tmp, slink);
                unlink(slink_tmp);
                goto exit;
        }
@@ -186,11 +186,11 @@ exit:
 static int update_link(struct udevice *udevice, const char *name)
 {
        LIST_HEAD(name_list);
-       char slink[PATH_SIZE];
-       char node[PATH_SIZE];
+       char slink[UTIL_PATH_SIZE];
+       char node[UTIL_PATH_SIZE];
        struct udevice *udevice_db;
        struct name_entry *device;
-       char target[PATH_MAX] = "";
+       char target[UTIL_PATH_SIZE] = "";
        int count;
        int priority = 0;
        int rc = 0;
@@ -271,7 +271,7 @@ out:
 void udev_node_update_symlinks(struct udevice *udevice, struct udevice *udevice_old)
 {
        struct name_entry *name_loop;
-       char symlinks[PATH_SIZE] = "";
+       char symlinks[UTIL_PATH_SIZE] = "";
 
        list_for_each_entry(name_loop, &udevice->symlink_list, node) {
                info(udevice->udev, "update symlink '%s' of '%s'\n", name_loop->name, udevice->dev->devpath);
@@ -321,7 +321,7 @@ void udev_node_update_symlinks(struct udevice *udevice, struct udevice *udevice_
 
 int udev_node_add(struct udevice *udevice)
 {
-       char filename[PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
        uid_t uid;
        gid_t gid;
        int i;
@@ -371,7 +371,7 @@ int udev_node_add(struct udevice *udevice)
 
        /* create all_partitions if requested */
        if (udevice->partitions) {
-               char partitionname[PATH_SIZE];
+               char partitionname[UTIL_PATH_SIZE];
                char *attr;
                int range;
 
@@ -400,8 +400,8 @@ exit:
 
 int udev_node_remove(struct udevice *udevice)
 {
-       char filename[PATH_SIZE];
-       char partitionname[PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
+       char partitionname[UTIL_PATH_SIZE];
        struct stat stats;
        int retval = 0;
        int num;