[PATCH] let klibc add the trailing newline to syslog conditionally

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index d855fce52c6a9cc40cd48b6ea8f1265f96662c02..8887125dd8aeba84b17ef77604a0456a2e86d101 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -33,9 +33,9 @@
 #include "udev.h"
 #include "udev_lib.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
+#include "udev_db.h"
+#include "logging.h"
 
 static int delete_path(const char *path)
 {
@@ -112,7 +112,7 @@ static int delete_node(struct udevice *udev)
        int len;
        int num;
 
-       snprintf(filename, NAME_SIZE-1, "%s/%s", udev_root, udev->name);
+       snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
        filename[NAME_SIZE-1] = '\0';
 
        info("removing device node '%s'", filename);
@@ -143,7 +143,7 @@ static int delete_node(struct udevice *udev)
                char linkname[NAME_SIZE];
 
                strfieldcpymax(linkname, pos, len+1);
-               snprintf(filename, NAME_SIZE-1, "%s/%s", udev_root, linkname);
+               snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
                filename[NAME_SIZE-1] = '\0';
 
                dbg("unlinking symlink '%s'", filename);
@@ -175,7 +175,7 @@ int udev_remove_device(struct udevice *udev)
        if (udev->type != 'b' && udev->type != 'c')
                return 0;
 
-       retval = udevdb_get_dev(udev);
+       retval = udev_db_get_device(udev);
        if (retval) {
                /* fall back to kernel name */
                temp = strrchr(udev->devpath, '/');
@@ -185,11 +185,16 @@ int udev_remove_device(struct udevice *udev)
                dbg("'%s' not found in database, falling back on default name", udev->name);
        }
 
+       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);
-       udevdb_delete_dev(udev);
+       udev_db_delete_device(udev);
 
        /* use full path to the environment */
-       snprintf(udev->devname, NAME_SIZE-1, "%s/%s", udev_root, udev->name);
+       snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
 
        return delete_node(udev);
 }