/*
* udev-remove.c
*
- * Userspace devfs
- *
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
#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)
{
char filename[PATH_SIZE];
continue;;
}
- dbg("removing symlink '%s'", filename);
+ info("removing symlink '%s'", filename);
unlink(filename);
if (strchr(filename, '/'))
if (retval)
return retval;
+ /* export DEVNAME to the environment */
+ snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
+ udev->devname[sizeof(udev->devname)-1] = '\0';
+
num = udev->partitions;
if (num > 0) {
info("removing all_partitions '%s[1-%i]'", filename, num);
if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
return 0;
- /* remove node only if we can find it in our database */
- if (udev_db_get_device(udev, udev->devpath) != 0) {
- dbg("'%s' not found in database, ignore event", udev->name);
- return -1;
- }
- if (udev->ignore_remove) {
- dbg("remove event for '%s' requested to be ignored by rule", udev->name);
- return 0;
+ if (udev_db_get_device(udev, udev->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("remove name='%s'", udev->name);
- udev_db_delete_device(udev);
-
- /* 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);
}