X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_remove.c;h=142503589a6f90a42f0da4cb392cba12f9f75525;hb=045b1f0f7a7af2182e7109f472d873f1cc0c5e4b;hp=d855fce52c6a9cc40cd48b6ea8f1265f96662c02;hpb=2b41e68a08548ce44b4d145900dab2bb04cd34f7;p=elogind.git

diff --git a/udev_remove.c b/udev_remove.c
index d855fce52..142503589 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -31,11 +31,11 @@
 #include <sys/stat.h>
 
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.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);
 }