From 218eae87273e6b1d401ac67f94d648c9f39a30fa Mon Sep 17 00:00:00 2001
From: "kay.sievers@vrfy.org" <kay.sievers@vrfy.org>
Date: Wed, 12 Nov 2003 03:48:01 -0800
Subject: [PATCH] [PATCH] add support for subdirs

  support subdirectory creation/removal for NAME="/devfs/is/crazy/video0"
  create parent subdirs for device node if needed
  remove subdirs when last node is removed
---
 udev-add.c    | 26 ++++++++++++++++++++++++++
 udev-remove.c | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/udev-add.c b/udev-add.c
index eb1c0fb6..9c546024 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -101,6 +101,32 @@ static int create_node(struct udevice *dev)
 		return -EINVAL;
 	}
 
+	/* create subdirectories if requested */
+	if (strchr(dev->name, '/')) {
+		char path[255];
+		char *pos;
+		struct stat stats;
+
+		strncpy(path, filename, sizeof(path));
+		pos = strchr(path+1, '/');
+		while (1) {
+			pos = strchr(pos+1, '/');
+			if (pos == NULL)
+				break;
+			*pos = 0x00;
+			if (stat(path, &stats)) {
+				retval = mkdir(path, 0755);
+				if (retval) {
+					dbg("mkdir(%s) failed with error '%s'",
+					    path, strerror(errno));
+					return retval;
+				}
+				dbg("created %s", path);
+			}
+			*pos = '/';
+		}
+	}
+
 	dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
 	retval = mknod(filename, dev->mode, res);
 	if (retval)
diff --git a/udev-remove.c b/udev-remove.c
index 666928f3..1cf5d513 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -69,12 +69,45 @@ exit:
 static int delete_node(char *name)
 {
 	char filename[255];
+	int retval;
 
 	strncpy(filename, udev_root, sizeof(filename));
 	strncat(filename, name, sizeof(filename));
 
 	dbg("unlinking %s", filename);
-	return unlink(filename);
+	retval = unlink(filename);
+	if (retval) {
+		dbg("unlink(%s) failed with error '%s'",
+			filename, strerror(errno));
+		return retval;
+	}
+
+	/* remove subdirectories */
+	if (strchr(name, '/')) {
+		char *pos;
+
+		pos = strrchr(filename, '/');
+		while (1) {
+			*pos = 0x00;
+			pos = strrchr(filename, '/');
+
+			/* don't remove the last one */
+			if ((pos == filename) || (pos == NULL))
+				break;
+
+			/* remove if empty */
+			retval = rmdir(filename);
+			if (retval) {
+				if (errno == ENOTEMPTY)
+					return 0;
+				dbg("rmdir(%s) failed with error '%s'",
+				    filename, strerror(errno));
+				break;
+			}
+			dbg("removed %s", filename);
+		}
+	}
+	return retval;
 }
 
 int udev_remove_device(char *device, char *subsystem)
-- 
2.39.5