X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils_file.c;h=acaffdc9181cfb9d1ea22a1da1ace59ae314faec;hp=23f61196b71d091b49b9dc3aaae44645d595b6ab;hb=83cc6ab4760817509f1ed1ee429669e563f82caf;hpb=ff3e4bed21aaff673284f2e024da26c1e39cfda6

diff --git a/udev_utils_file.c b/udev_utils_file.c
index 23f61196b..acaffdc91 100644
--- a/udev_utils_file.c
+++ b/udev_utils_file.c
@@ -30,11 +30,7 @@
 #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)
 {
@@ -63,6 +59,37 @@ int create_path(const char *path)
 	return mkdir(p, 0755);
 }
 
+int delete_path(const char *path)
+{
+	char p[PATH_SIZE];
+	char *pos;
+	int retval;
+
+	strcpy (p, path);
+	pos = strrchr(p, '/');
+	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,
  * that permisions of possible hard links will be removed too.
  */
@@ -72,18 +99,18 @@ int unlink_secure(const char *filename)
 
 	retval = chown(filename, 0, 0);
 	if (retval)
-		dbg("chown(%s, 0, 0) failed: %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: %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: %s", filename, strerror(errno));
+		err("unlink(%s) failed: %s", filename, strerror(errno));
 
 	return retval;
 }