[PATCH] DEVPATH for netdev

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 666928f318fa7699062f75009f503179262a1ce0..27ff5bc0a2e12d38167ba1db43d85ca78ac3ccf0 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -29,70 +29,132 @@
 #include <errno.h>
 
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
+static int delete_path(char *path)
+{
+       char *pos;
+       int retval;
 
-/*
- * Look up the sysfs path in the database to see if we have named this device
- * 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 *path, int major, int minor)
+       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;
+                       dbg("rmdir(%s) failed with error '%s'",
+                           path, strerror(errno));
+                       break;
+               }
+               dbg("removed '%s'", path);
+       }
+       return 0;
+}
+
+static int delete_node(struct udevice *dev)
 {
-       static char name[100];
-       struct udevice *dev;
-       char *temp;
+       char filename[NAME_SIZE];
+       char linkname[NAME_SIZE];
+       char partitionname[NAME_SIZE];
+       int retval;
+       int i;
+       char *pos;
+       int len;
+
+       strfieldcpy(filename, udev_root);
+       strfieldcat(filename, dev->name);
 
-       dev = udevdb_get_dev(path);
-       if (dev != NULL) {
-               strcpy(name, dev->name);
-               goto exit;
+       info("removing device node '%s'", filename);
+       retval = unlink(filename);
+       if (errno == ENOENT)
+               retval = 0;
+       if (retval) {
+               dbg("unlink(%s) failed with error '%s'",
+                       filename, strerror(errno));
+               return retval;
        }
 
-       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));
+       /* remove partition nodes */
+       if (dev->partitions > 0) {
+               info("removing partitions '%s[1-%i]'", filename, dev->partitions);
+               for (i = 1; i <= dev->partitions; i++) {
+                       strfieldcpy(partitionname, filename);
+                       strintcat(partitionname, i);
+                       unlink(partitionname);
+               }
+       }
+
+       /* remove subdirectories */
+       if (strchr(dev->name, '/'))
+               delete_path(filename);
 
-exit:
-       dbg("name is %s", name);
-       return &name[0];
+       foreach_strpart(dev->symlink, " ", pos, len) {
+               strfieldcpymax(linkname, pos, len+1);
+               strfieldcpy(filename, udev_root);
+               strfieldcat(filename, linkname);
+
+               dbg("unlinking symlink '%s'", filename);
+               retval = unlink(filename);
+               if (errno == ENOENT)
+                       retval = 0;
+               if (retval) {
+                       dbg("unlink(%s) failed with error '%s'",
+                               filename, strerror(errno));
+                       return retval;
+               }
+               if (strchr(dev->symlink, '/')) {
+                       delete_path(filename);
+               }
+       }
+
+       return retval;
 }
 
 /*
- * We also want to clean up any symlinks that were created in create_node()
+ * Look up the sysfs path in the database to see if we have named this device
+ * 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 int delete_node(char *name)
+int udev_remove_device(char *path, char *subsystem)
 {
-       char filename[255];
-
-       strncpy(filename, udev_root, sizeof(filename));
-       strncat(filename, name, sizeof(filename));
+       struct udevice dev;
+       char *temp;
+       int retval;
 
-       dbg("unlinking %s", filename);
-       return unlink(filename);
-}
+       memset(&dev, 0x00, sizeof(dev));
 
-int udev_remove_device(char *device, char *subsystem)
-{
-       char *name;
-       int retval = 0;
-
-       name = get_name(device, 0, 0);
-       if (name == NULL) {
-               dbg ("get_name failed");
-               retval = -ENODEV;
-               goto exit;
+       retval = udevdb_get_dev(path, &dev);
+       if (retval != 0) {
+               dbg("'%s' not found in database, falling back on default name", path);
+               temp = strrchr(path, '/');
+               if (temp == NULL)
+                       return -ENODEV;
+               strfieldcpy(dev.name, &temp[1]);
        }
+       dbg("name='%s'", dev.name);
 
-       udevdb_delete_dev(device);
+       dev.type = get_device_type(path, subsystem);
+       dev_d_send(&dev, subsystem, path);
+       udevdb_delete_dev(path);
 
-       return delete_node(name);
+       if (dev.type == 'b' || dev.type == 'c')
+               retval = delete_node(&dev);
+       else if (dev.type == 'n')
+               retval = 0;
 
-exit:
        return retval;
 }