[PATCH] netdev - udevdb+dev.d changes

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 8794429635bd0caec5f53b294dcd713464f720b2..c838f15ce3521a6510a128320db658b6afef47a2 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -29,8 +29,8 @@
 #include <errno.h>
 
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -51,6 +51,8 @@ static int delete_path(char *path)
 
                /* remove if empty */
                retval = rmdir(path);
+               if (errno == ENOENT)
+                       retval = 0;
                if (retval) {
                        if (errno == ENOTEMPTY)
                                return 0;
@@ -65,18 +67,21 @@ static int delete_path(char *path)
 
 static int delete_node(struct udevice *dev)
 {
-       char filename[255];
-       char partitionname[255];
-       char *symlinks;
-       char *linkname;
+       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);
 
        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));
@@ -87,7 +92,8 @@ static int delete_node(struct udevice *dev)
        if (dev->partitions > 0) {
                info("removing partitions '%s[1-%i]'", filename, dev->partitions);
                for (i = 1; i <= dev->partitions; i++) {
-                       sprintf(partitionname, "%s%i", filename, i);
+                       strfieldcpy(partitionname, filename);
+                       strintcat(partitionname, i);
                        unlink(partitionname);
                }
        }
@@ -96,26 +102,22 @@ static int delete_node(struct udevice *dev)
        if (strchr(dev->name, '/'))
                delete_path(filename);
 
-       if (dev->symlink[0] != '\0') {
-               symlinks = dev->symlink;
-               while (1) {
-                       linkname = strsep(&symlinks, " ");
-                       if (linkname == NULL)
-                               break;
-
-                       strfieldcpy(filename, udev_root);
-                       strfieldcat(filename, linkname);
-
-                       dbg("unlinking symlink '%s'", filename);
-                       retval = unlink(filename);
-                       if (retval) {
-                               dbg("unlink(%s) failed with error '%s'",
-                                       filename, strerror(errno));
-                               return retval;
-                       }
-                       if (strchr(dev->symlink, '/')) {
-                               delete_path(filename);
-                       }
+       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);
                }
        }
 
@@ -133,22 +135,26 @@ int udev_remove_device(char *path, char *subsystem)
        char *temp;
        int retval;
 
-       memset(&dev, 0, sizeof(dev));
+       memset(&dev, 0x00, sizeof(dev));
 
        retval = udevdb_get_dev(path, &dev);
-       if (retval) {
+       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);
 
-       dbg("name is '%s'", dev.name);
+       dev.type = get_device_type(path, subsystem);
+       dev_d_send(&dev, subsystem);
        udevdb_delete_dev(path);
 
-       sysbus_send_remove(dev.name, path);
+       if (dev.type == 'b' || dev.type == 'c')
+               retval = delete_node(&dev);
+       else if (dev.type == 'n')
+               retval = 0;
 
-       retval = delete_node(&dev);
        return retval;
 }