#include <errno.h>
#include <sys/stat.h>
-#include "udev_libc_wrapper.h"
#include "udev.h"
-#include "udev_utils.h"
-#include "udev_version.h"
-#include "udev_db.h"
-#include "logging.h"
-
-static int delete_path(const char *path)
-{
- char *pos;
- int retval;
-
- 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 *udev)
{
int i;
int num;
- list_for_each_entry(name_loop, &udev->symlink_list, node) {
- snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
- filename[sizeof(filename)-1] = '\0';
+ if (!list_empty(&udev->symlink_list)) {
+ char symlinks[512] = "";
- if (stat(filename, &stats) != 0) {
- dbg("symlink '%s' not found", filename);
- continue;
- }
- if (udev->devt && stats.st_rdev != udev->devt) {
- info("symlink '%s' points to a different device, skip removal", filename);
- continue;;
- }
+ list_for_each_entry(name_loop, &udev->symlink_list, node) {
+ snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
+ filename[sizeof(filename)-1] = '\0';
+
+ if (stat(filename, &stats) != 0) {
+ dbg("symlink '%s' not found", filename);
+ continue;
+ }
+ if (udev->devt && stats.st_rdev != udev->devt) {
+ info("symlink '%s' points to a different device, skip removal", filename);
+ continue;
+ }
+
+ info("removing symlink '%s'", filename);
+ unlink(filename);
- dbg("removing symlink '%s'", filename);
- unlink(filename);
+ if (strchr(filename, '/'))
+ delete_path(filename);
- if (strchr(filename, '/'))
- delete_path(filename);
+ strlcat(symlinks, filename, sizeof(symlinks));
+ strlcat(symlinks, " ", sizeof(symlinks));
+ }
+
+ remove_trailing_chars(symlinks, ' ');
+ if (symlinks[0] != '\0')
+ setenv("DEVLINKS", symlinks, 1);
}
snprintf(filename, sizeof(filename), "%s/%s", udev_root, udev->name);
if (retval)
return retval;
+ setenv("DEVNAME", filename, 1);
+
num = udev->partitions;
if (num > 0) {
info("removing all_partitions '%s[1-%i]'", filename, num);
*/
int udev_remove_device(struct udevice *udev)
{
- if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
+ if (major(udev->devt) == 0)
return 0;
- if (udev_db_get_device(udev, udev->devpath) == 0) {
+ if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
if (udev->ignore_remove) {
dbg("remove event for '%s' requested to be ignored by rule", udev->name);
return 0;
dbg("remove name='%s'", udev->name);
udev_db_delete_device(udev);
} else {
- dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
- strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
+ dbg("'%s' not found in database, using kernel name '%s'", udev->dev->devpath, udev->dev->kernel_name);
+ strlcpy(udev->name, udev->dev->kernel_name, sizeof(udev->name));
}
- /* use full path to the environment */
- snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
- udev->devname[sizeof(udev->devname)-1] = '\0';
return delete_node(udev);
}