#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"
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);
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 (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);
- }
+ 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);
}
}
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, path);
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;
}