[PATCH] add test and documentation for new %D devfs format modifier

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 430f1c901e316592f6ab7dc1af0eee196c1d7dad..0f14a3d685f7745e3afa8c05ea2443c8e640138a 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -40,21 +40,26 @@
  * something different from the kernel name.  If we have, us it.  If not, use
  * the default kernel name for lack of anything else to know to do.
  */
-static char *get_name(char *dev, int major, int minor)
+static char *get_name(char *path, int major, int minor)
 {
        static char name[100];
+       struct udevice *dev;
        char *temp;
 
-       if (udevdb_get_dev(dev, &name[0], sizeof(name)) == 0)
+       dev = udevdb_get_dev(path);
+       if (dev != NULL) {
+               strcpy(name, dev->name);
                goto exit;
+       }
 
-       temp = strrchr(dev, '/');
+       dbg("'%s' not found in database, falling back on default name", path);
+       temp = strrchr(path, '/');
        if (temp == NULL)
                return NULL;
        strncpy(name, &temp[1], sizeof(name));
 
 exit:
-       dbg("name is %s", name);
+       dbg("name is '%s'", name);
        return &name[0];
 }
 
@@ -64,12 +69,45 @@ exit:
 static int delete_node(char *name)
 {
        char filename[255];
+       int retval;
 
-       strncpy(filename, UDEV_ROOT, sizeof(filename));
+       strncpy(filename, udev_root, sizeof(filename));
        strncat(filename, name, sizeof(filename));
 
-       dbg("unlinking %s", filename);
-       return unlink(filename);
+       dbg("unlinking '%s'", 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)
@@ -84,7 +122,6 @@ int udev_remove_device(char *device, char *subsystem)
                goto exit;
        }
 
-       udevdb_delete_udevice(name);
        udevdb_delete_dev(device);
 
        return delete_node(name);