080 release

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index 2df555327bbeef9a7dd6270e98b7a1201b651424..945618ce5a0c6a8f5e32091076eb17595da171eb 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -1,10 +1,8 @@
 /*
  * 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
@@ -30,46 +28,12 @@
 #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)
 {
        char filename[PATH_SIZE];
+       char devname[PATH_SIZE];
        char partitionname[PATH_SIZE];
        struct name_entry *name_loop;
        struct stat stats;
@@ -90,7 +54,7 @@ static int delete_node(struct udevice *udev)
                        continue;;
                }
 
-               dbg("removing symlink '%s'", filename);
+               info("removing symlink '%s'", filename);
                unlink(filename);
 
                if (strchr(filename, '/'))
@@ -114,6 +78,10 @@ static int delete_node(struct udevice *udev)
        if (retval)
                return retval;
 
+       snprintf(devname, sizeof(devname), "%s/%s", udev_root, udev->name);
+       devname[sizeof(devname)-1] = '\0';
+       setenv("DEVNAME", devname, 1);
+
        num = udev->partitions;
        if (num > 0) {
                info("removing all_partitions '%s[1-%i]'", filename, num);
@@ -140,12 +108,10 @@ static int delete_node(struct udevice *udev)
  */
 int udev_remove_device(struct udevice *udev)
 {
-       const char *temp;
-
-       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;
@@ -153,17 +119,9 @@ int udev_remove_device(struct udevice *udev)
                dbg("remove name='%s'", udev->name);
                udev_db_delete_device(udev);
        } else {
-               /* fall back to kernel name */
-               temp = strrchr(udev->devpath, '/');
-               if (temp == NULL)
-                       return -ENODEV;
-               strlcpy(udev->name, &temp[1], sizeof(udev->name));
-               info("'%s' not found in database, falling back on default name", 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);
 }