selinux: more context settings

[elogind.git] / udev_utils_file.c

diff --git a/udev_utils_file.c b/udev_utils_file.c
index f8518f64ade113b7df2f919e5bd6da161c3b2516..9ab34705e2dd70c1d0becdc64c8db13439458273 100644 (file)
--- a/udev_utils_file.c
+++ b/udev_utils_file.c
@@ -1,6 +1,4 @@
 /*
- * udev_utils_file.c - files operations
- *
  * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -30,37 +28,76 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.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)
+       dbg("stat '%s'", 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);
+       dbg("mkdir '%s'", p);
+       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)
+{
+       char p[PATH_SIZE];
+       char *pos;
+       int retval;
+
+       strcpy (p, path);
+       pos = strrchr(p, '/');
+       if (pos == p || pos == NULL)
+               return 0;
+
+       while (1) {
+               *pos = '\0';
+               pos = strrchr(p, '/');
+
+               /* don't remove the last one */
+               if ((pos == p) || (pos == NULL))
+                       break;
+
+               /* remove if empty */
+               retval = rmdir(p);
+               if (errno == ENOENT)
+                       retval = 0;
+               if (retval) {
+                       if (errno == ENOTEMPTY)
+                               return 0;
+                       err("rmdir(%s) failed: %s", p, strerror(errno));
+                       break;
+               }
+               dbg("removed '%s'", p);
+       }
+       return 0;
 }
 
 /* Reset permissions on the device node, before unlinking it to make sure,
@@ -72,18 +109,18 @@ int unlink_secure(const char *filename)
 
        retval = chown(filename, 0, 0);
        if (retval)
-               dbg("chown(%s, 0, 0) failed with error '%s'", filename, strerror(errno));
+               err("chown(%s, 0, 0) failed: %s", filename, strerror(errno));
 
        retval = chmod(filename, 0000);
        if (retval)
-               dbg("chmod(%s, 0000) failed with error '%s'", filename, strerror(errno));
+               err("chmod(%s, 0000) failed: %s", filename, strerror(errno));
 
        retval = unlink(filename);
        if (errno == ENOENT)
                retval = 0;
 
        if (retval)
-               dbg("unlink(%s) failed with error '%s'", filename, strerror(errno));
+               err("unlink(%s) failed: %s", filename, strerror(errno));
 
        return retval;
 }