#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)
{
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);
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);
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, '/');
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);
}