udevadm: info - add --export format to --device-id-of-file=

[elogind.git] / udev_utils_file.c

diff --git a/udev_utils_file.c b/udev_utils_file.c
index 9bf60696d94ed74d9ddd79d5b854e918154dc1c2..a492785af9ed656a350b209bc05ba1d02394cf0c 100644 (file)
--- a/udev_utils_file.c
+++ b/udev_utils_file.c
@@ -29,32 +29,42 @@
 #include <sys/mman.h>
 
 #include "udev.h"
+#include "udev_selinux.h"
 
 int create_path(const char *path)
 {
        char p[PATH_SIZE];
        char *pos;
        struct stat stats;
+       int ret;
 
-       strcpy (p, path);
+       strlcpy(p, path, sizeof(p));
        pos = strrchr(p, '/');
        if (pos == p || pos == NULL)
                return 0;
 
        while (pos[-1] == '/')
                pos--;
-
        pos[0] = '\0';
 
        dbg("stat '%s'\n", p);
        if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
                return 0;
 
-       if (create_path (p) != 0)
+       if (create_path(p) != 0)
                return -1;
 
        dbg("mkdir '%s'\n", p);
-       return mkdir(p, 0755);
+       selinux_setfscreatecon(p, NULL, S_IFDIR|0755);
+       ret = mkdir(p, 0755);
+       selinux_resetfscreatecon();
+       if (ret == 0)
+               return 0;
+
+       if (errno == EEXIST)
+               if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
+                       return 0;
+       return -1;
 }
 
 int delete_path(const char *path)
@@ -65,6 +75,9 @@ int delete_path(const char *path)
 
        strcpy (p, path);
        pos = strrchr(p, '/');
+       if (pos == p || pos == NULL)
+               return 0;
+
        while (1) {
                *pos = '\0';
                pos = strrchr(p, '/');
@@ -80,10 +93,10 @@ int delete_path(const char *path)
                if (retval) {
                        if (errno == ENOTEMPTY)
                                return 0;
-                       err("rmdir(%s) failed: %s", p, strerror(errno));
+                       err("rmdir(%s) failed: %s\n", p, strerror(errno));
                        break;
                }
-               dbg("removed '%s'", p);
+               dbg("removed '%s'\n", p);
        }
        return 0;
 }
@@ -97,18 +110,18 @@ int unlink_secure(const char *filename)
 
        retval = chown(filename, 0, 0);
        if (retval)
-               err("chown(%s, 0, 0) failed: %s", filename, strerror(errno));
+               err("chown(%s, 0, 0) failed: %s\n", filename, strerror(errno));
 
        retval = chmod(filename, 0000);
        if (retval)
-               err("chmod(%s, 0000) failed: %s", filename, strerror(errno));
+               err("chmod(%s, 0000) failed: %s\n", filename, strerror(errno));
 
        retval = unlink(filename);
        if (errno == ENOENT)
                retval = 0;
 
        if (retval)
-               err("unlink(%s) failed: %s", filename, strerror(errno));
+               err("unlink(%s) failed: %s\n", filename, strerror(errno));
 
        return retval;
 }