From 0da0efb2b622435209d183b49e2d16d426142b2c Mon Sep 17 00:00:00 2001
From: Scott James Remnant <scott@ubuntu.com>
Date: Tue, 22 Nov 2005 15:44:02 +0100
Subject: [PATCH] move delete_path() to utils

---
 udev_remove.c     | 29 -----------------------------
 udev_utils.h      |  1 +
 udev_utils_file.c | 31 +++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/udev_remove.c b/udev_remove.c
index 835186047..6efa17eb7 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -34,35 +34,6 @@
 #include "udev_version.h"
 #include "logging.h"
 
-static int delete_path(const char *path)
-{
-	char *pos;
-	int retval;
-
-	pos = strrchr(path, '/');
-	while (1) {
-		*pos = '\0';
-		pos = strrchr(path, '/');
-
-		/* don't remove the last one */
-		if ((pos == path) || (pos == NULL))
-			break;
-
-		/* remove if empty */
-		retval = rmdir(path);
-		if (errno == ENOENT)
-			retval = 0;
-		if (retval) {
-			if (errno == ENOTEMPTY)
-				return 0;
-			err("rmdir(%s) failed: %s", path, strerror(errno));
-			break;
-		}
-		dbg("removed '%s'", path);
-	}
-	return 0;
-}
-
 static int delete_node(struct udevice *udev)
 {
 	char filename[PATH_SIZE];
diff --git a/udev_utils.h b/udev_utils.h
index ffdaf0469..a28ba005c 100644
--- a/udev_utils.h
+++ b/udev_utils.h
@@ -51,6 +51,7 @@ extern int replace_untrusted_chars(char *str);
 
 /* udev_utils_file.c */
 extern int create_path(const char *path);
+extern int delete_path(const char *path);
 extern int file_map(const char *filename, char **buf, size_t *bufsize);
 extern void file_unmap(void *buf, size_t bufsize);
 extern int unlink_secure(const char *filename);
diff --git a/udev_utils_file.c b/udev_utils_file.c
index a3dab58b3..cd9c244f0 100644
--- a/udev_utils_file.c
+++ b/udev_utils_file.c
@@ -63,6 +63,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.
  */
-- 
2.30.2