[PATCH] add support for subdirs

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 666928f318fa7699062f75009f503179262a1ce0..1cf5d5134d92cd56dfdb8baeac4562ff4e62519a 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -69,12 +69,45 @@ exit:
 static int delete_node(char *name)
 {
        char filename[255];
 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);
 
        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)
 }
 
 int udev_remove_device(char *device, char *subsystem)