X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=0a37ef2fbca2aee86d0c628cf1100d71cd67da1c;hp=80d5f1a499be4c631c5bf6c9f80ce5d441bd70af;hb=5e39f90b14ccf242618086a0242000fc11317a75;hpb=f8c1ccde6aaf08c858616c9a8a83c06d609f52f5

diff --git a/namedev.c b/namedev.c
index 80d5f1a49..0a37ef2fb 100644
--- a/namedev.c
+++ b/namedev.c
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -31,23 +32,18 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/sysinfo.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.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"
 
 static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
 
-LIST_HEAD(config_device_list);
-LIST_HEAD(perm_device_list);
-
-
 /* compare string with pattern (supports * ? [0-9] [!A-Z]) */
 static int strcmp_pattern(const char *p, const char *s)
 {
@@ -101,44 +97,6 @@ static int strcmp_pattern(const char *p, const char *s)
 	return 1;
 }
 
-static struct perm_device *find_perm(char *name)
-{
-	struct perm_device *perm;
-
-	list_for_each_entry(perm, &perm_device_list, node) {
-		if (strcmp_pattern(perm->name, name))
-			continue;
-		return perm;
-	}
-	return NULL;
-}
-
-static mode_t get_default_mode(void)
-{
-	mode_t mode = 0600;	/* default to owner rw only */
-
-	if (strlen(default_mode_str) != 0)
-		mode = strtol(default_mode_str, NULL, 8);
-
-	return mode;
-}
-
-static char *get_default_owner(void)
-{
-	if (strlen(default_owner_str) == 0)
-		strfieldcpy(default_owner_str, "root");
-
-	return default_owner_str;
-}
-
-static char *get_default_group(void)
-{
-	if (strlen(default_group_str) == 0)
-		strfieldcpy(default_group_str, "root");
-
-	return default_group_str;
-}
-
 /* extract possible {attr} and move str behind it */
 static char *get_format_attribute(char **str)
 {
@@ -184,29 +142,29 @@ static int get_format_len(char **str)
  *  @param  name                Name to check for
  *  @return                     0 if <name> didn't exist and N otherwise.
  */
-static unsigned int find_free_number (struct udevice *udev, char *name)
+static int find_free_number(struct udevice *udev, const char *name)
 {
-	char temp[NAME_SIZE];
-	char path[NAME_SIZE];
-	struct udevice dev;
-	int result;
+	char filename[NAME_SIZE];
+	int num = 0;
+	struct udevice db_udev;
 
-	/* have to sweep the database for each lookup */
-	result = 0;
-	strncpy(temp, name, sizeof (temp));
+	strfieldcpy(filename, name);
 	while (1) {
-		if (udevdb_get_dev_byname(temp, path, &dev) != 0)
-			goto found;
-		/* symlink might be stale if $(udevroot) isn't cleaned; check
-		 * on major/minor to see if it's the same device
-		 */
-		if (dev.major == udev->major && dev.minor == udev->minor)
-			goto found;
-		snprintf (temp, sizeof(temp), "%s%d", name, ++result);
-	}
+		dbg("look for existing node '%s'", filename);
+		memset(&db_udev, 0x00, sizeof(struct udevice));
+		if (udev_db_get_device_byname(&db_udev, filename) != 0) {
+			dbg("free num=%d", num);
+			return num;
+		}
 
-found:
-	return result;
+		num++;
+		if (num > 1000) {
+			info("find_free_number gone crazy (num=%d), aborted", num);
+			return -1;
+		}
+		snprintf(filename, NAME_SIZE, "%s%d", name, num);
+		filename[NAME_SIZE-1] = '\0';
+	}
 }
 
 static void apply_format(struct udevice *udev, char *string, size_t maxsize,
@@ -226,6 +184,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 	int slen;
 	struct sysfs_attribute *tmpattr;
 	unsigned int next_free_number;
+	struct sysfs_class_device *class_dev_parent;
 
 	pos = string;
 	while (1) {
@@ -244,6 +203,12 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 
 
 		switch (c) {
+		case 'p':
+			if (strlen(udev->devpath) == 0)
+				break;
+			strfieldcatmax(string, udev->devpath, maxsize);
+			dbg("substitute kernel name '%s'", udev->kernel_name);
+			break;
 		case 'b':
 			if (strlen(udev->bus_id) == 0)
 				break;
@@ -263,12 +228,12 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 			dbg("substitute kernel number '%s'", udev->kernel_number);
 				break;
 		case 'm':
-			strintcatmax(string, udev->minor, maxsize);
-			dbg("substitute minor number '%u'", udev->minor);
+			strintcatmax(string, minor(udev->devt), maxsize);
+			dbg("substitute minor number '%u'", minor(udev->devt));
 			break;
 		case 'M':
-			strintcatmax(string, udev->major, maxsize);
-			dbg("substitute major number '%u'", udev->major);
+			strintcatmax(string, major(udev->devt), maxsize);
+			dbg("substitute major number '%u'", major(udev->devt));
 			break;
 		case 'c':
 			if (strlen(udev->program_result) == 0)
@@ -299,28 +264,30 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 			}
 			break;
 		case 's':
-			if (attr != NULL) {
-				tmpattr = find_sysfs_attribute(class_dev, sysfs_device, attr);
-				if (tmpattr == NULL) {
-					dbg("sysfa attribute '%s' not found", attr);
-					break;
-				}
-				/* strip trailing whitespace of matching value */
-				if (isspace(tmpattr->value[strlen(tmpattr->value)-1])) {
-					i = len = strlen(tmpattr->value);
-					while (i > 0 &&  isspace(tmpattr->value[i-1]))
-						i--;
-					if (i < len) {
-						tmpattr->value[i] = '\0';
-						dbg("remove %i trailing whitespace chars from '%s'",
-							 len - i, tmpattr->value);
-					}
-				}
-				strfieldcatmax(string, tmpattr->value, maxsize);
-				dbg("substitute sysfs value '%s'", tmpattr->value);
-			} else {
+			if (!class_dev)
+				break;
+			if (attr == NULL) {
 				dbg("missing attribute");
+				break;
+			}
+			tmpattr = find_sysfs_attribute(class_dev, sysfs_device, attr);
+			if (tmpattr == NULL) {
+				dbg("sysfa attribute '%s' not found", attr);
+				break;
+			}
+			/* strip trailing whitespace of matching value */
+			if (isspace(tmpattr->value[strlen(tmpattr->value)-1])) {
+				i = len = strlen(tmpattr->value);
+				while (i > 0 &&  isspace(tmpattr->value[i-1]))
+					i--;
+				if (i < len) {
+					tmpattr->value[i] = '\0';
+					dbg("remove %i trailing whitespace chars from '%s'",
+						 len - i, tmpattr->value);
+				}
 			}
+			strfieldcatmax(string, tmpattr->value, maxsize);
+			dbg("substitute sysfs value '%s'", tmpattr->value);
 			break;
 		case '%':
 			strfieldcatmax(string, "%", maxsize);
@@ -329,10 +296,41 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 		case 'e':
 			next_free_number = find_free_number(udev, string);
 			if (next_free_number > 0) {
-				snprintf(temp2, sizeof(temp2), "%d", next_free_number);
+				sprintf(temp2, "%d", next_free_number);
 				strfieldcatmax(string, temp2, maxsize);
 			}
 			break;
+		case 'P':
+			if (!class_dev)
+				break;
+			class_dev_parent = sysfs_get_classdev_parent(class_dev);
+			if (class_dev_parent != NULL) {
+				struct udevice udev_parent;
+
+				dbg("found parent '%s', get the node name", class_dev_parent->path);
+				memset(&udev_parent, 0x00, sizeof(struct udevice));
+				/* lookup the name in the udev_db with the DEVPATH of the parent */
+				if (udev_db_get_device_by_devpath(&udev_parent, &class_dev_parent->path[strlen(sysfs_path)]) == 0) {
+					strfieldcatmax(string, udev_parent.name, maxsize);
+					dbg("substitute parent node name'%s'", udev_parent.name);
+				} else
+					dbg("parent not found in database");
+			}
+			break;
+		case 'N':
+			if (udev->tmp_node[0] == '\0') {
+				dbg("create temporary device node for callout");
+				snprintf(udev->tmp_node, NAME_SIZE, "%s/.tmp-%u-%u", udev_root, major(udev->devt), minor(udev->devt));
+				udev->tmp_node[NAME_SIZE] = '\0';
+				udev_make_node(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
+			}
+			strfieldcatmax(string, udev->tmp_node, maxsize);
+			dbg("substitute temporary device node name '%s'", udev->tmp_node);
+			break;
+		case 'r':
+			strfieldcatmax(string, udev_root, maxsize);
+			dbg("substitute udev_root '%s'", udev_root);
+			break;
 		default:
 			dbg("unknown substitution type '%%%c'", c);
 			break;
@@ -358,7 +356,7 @@ static void fix_kernel_name(struct udevice *udev)
 	}
 }
 
-static int execute_program(const char *path, char *value, int len)
+static int execute_program(struct udevice *udev, const char *path, char *value, int len)
 {
 	int retval;
 	int count;
@@ -391,7 +389,7 @@ static int execute_program(const char *path, char *value, int len)
 		dbg("execute '%s' with parsed arguments", arg);
 	} else {
 		argv[0] = arg;
-		argv[1] = main_argv[1];
+		argv[1] = udev->subsystem;
 		argv[2] = NULL;
 		dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
 	}
@@ -444,7 +442,7 @@ static int execute_program(const char *path, char *value, int len)
 		dbg("result is '%s'", value);
 
 		close(fds[0]);
-		wait(&status);
+		waitpid(pid, &status, 0);
 
 		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
 			dbg("exec program status 0x%x", status);
@@ -539,7 +537,7 @@ static int match_sysfs_pairs(struct config_device *dev, struct sysfs_class_devic
 static int match_id(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
 	char path[SYSFS_PATH_MAX];
-	char *temp = NULL;
+	char *temp;
 
 	/* we have to have a sysfs device for ID to work */
 	if (!sysfs_device)
@@ -558,61 +556,80 @@ static int match_id(struct config_device *dev, struct sysfs_class_device *class_
 static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
 	char path[SYSFS_PATH_MAX];
-	int found;
-	char *temp = NULL;
+	char *temp;
 
 	/* we have to have a sysfs device for PLACE to work */
 	if (!sysfs_device)
 		return -ENODEV;
 
-	found = 0;
 	strfieldcpy(path, sysfs_device->path);
 	temp = strrchr(path, '/');
 	dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
-	if (strstr(temp, dev->place) != NULL) {
-		found = 1;
-	} else {
-		*temp = 0x00;
-		temp = strrchr(path, '/');
-		dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
-		if (strstr(temp, dev->place) != NULL)
-			found = 1;
-	}
-	if (!found) {
-		dbg("place doesn't match");
-		return -ENODEV;
-	}
+	if (strstr(temp, dev->place) != NULL)
+		return 0;
 
-	return 0;
+	/* try the parent */
+	temp[0] = '\0';
+	temp = strrchr(path, '/');
+	dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
+	if (strstr(temp, dev->place) == NULL)
+		return 0;
+
+	dbg("place doesn't match");
+	return -ENODEV;
 }
 
-static int match_rule(struct config_device *dev, struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_rule(struct udevice *udev, struct config_device *dev,
+		      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
+	/* check for matching kernel name */
+	if (dev->kernel[0] != '\0') {
+		dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'",
+		    dev->kernel, class_dev->name);
+		if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
+			dbg(FIELD_KERNEL " is not matching");
+			goto exit;
+		}
+		dbg(FIELD_KERNEL " matches");
+	}
+
+	/* check for matching subsystem */
+	if (dev->subsystem[0] != '\0') {
+		dbg("check for " FIELD_SUBSYSTEM " dev->subsystem='%s' class_dev->name='%s'",
+		    dev->subsystem, class_dev->name);
+		if (strcmp_pattern(dev->subsystem, udev->subsystem) != 0) {
+			dbg(FIELD_SUBSYSTEM " is not matching");
+			goto exit;
+		}
+		dbg(FIELD_SUBSYSTEM " matches");
+	}
+
+	/* walk up the chain of physical devices and find a match */
 	while (1) {
+		/* check for matching driver */
+		if (dev->driver[0] != '\0') {
+			dbg("check for " FIELD_DRIVER " dev->driver='%s' sysfs_device->driver_name='%s'",
+			    dev->driver, sysfs_device->driver_name);
+			if (strcmp_pattern(dev->driver, sysfs_device->driver_name) != 0) {
+				dbg(FIELD_DRIVER " is not matching");
+				goto try_parent;
+			}
+			dbg(FIELD_DRIVER " matches");
+		}
+
 		/* check for matching bus value */
 		if (dev->bus[0] != '\0') {
 			if (sysfs_device == NULL) {
 				dbg("device has no bus");
 				goto try_parent;
 			}
-			dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+			dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'",
+			    dev->bus, sysfs_device->bus);
 			if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
 				dbg(FIELD_BUS " is not matching");
 				goto try_parent;
-			} else {
-				dbg(FIELD_BUS " matches");
-			}
-		}
-
-		/* check for matching kernel name*/
-		if (dev->kernel[0] != '\0') {
-			dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
-			if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
-				dbg(FIELD_KERNEL " is not matching");
-				goto try_parent;
-			} else {
-				dbg(FIELD_KERNEL " matches");
 			}
+			dbg(FIELD_BUS " matches");
 		}
 
 		/* check for matching bus id */
@@ -621,9 +638,8 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			if (match_id(dev, class_dev, sysfs_device) != 0) {
 				dbg(FIELD_ID " is not matching");
 				goto try_parent;
-			} else {
-				dbg(FIELD_ID " matches");
 			}
+			dbg(FIELD_ID " matches");
 		}
 
 		/* check for matching place of device */
@@ -632,9 +648,8 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			if (match_place(dev, class_dev, sysfs_device) != 0) {
 				dbg(FIELD_PLACE " is not matching");
 				goto try_parent;
-			} else {
-				dbg(FIELD_PLACE " matches");
 			}
+			dbg(FIELD_PLACE " matches");
 		}
 
 		/* check for matching sysfs pairs */
@@ -643,52 +658,51 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
 				dbg(FIELD_SYSFS " is not matching");
 				goto try_parent;
-			} else {
-				dbg(FIELD_SYSFS " matches");
-			}
-		}
-
-		/* execute external program */
-		if (dev->program[0] != '\0') {
-			char program[PROGRAM_SIZE];
-
-			dbg("check " FIELD_PROGRAM);
-			strfieldcpy(program, dev->program);
-			apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
-			if (execute_program(program, udev->program_result, NAME_SIZE) != 0) {
-				dbg(FIELD_PROGRAM " returned nonzero");
-				goto try_parent;
-			} else {
-				dbg(FIELD_PROGRAM " returned successful");
 			}
+			dbg(FIELD_SYSFS " matches");
 		}
 
-		/* check for matching result of external program */
-		if (dev->result[0] != '\0') {
-			dbg("check for " FIELD_RESULT
-			    " dev->result='%s', udev->program_result='%s'",
-			    dev->result, udev->program_result);
-			if (strcmp_pattern(dev->result, udev->program_result) != 0) {
-				dbg(FIELD_RESULT " is not matching");
-				goto try_parent;
-			} else {
-				dbg(FIELD_RESULT " matches");
-			}
-		}
-
-		/* Yeah, we matched! */
-		return 0;
-
+		/* found matching physical device  */
+		break;
 try_parent:
 		dbg("try parent sysfs device");
 		sysfs_device = sysfs_get_device_parent(sysfs_device);
 		if (sysfs_device == NULL)
-			return -ENODEV;
+			goto exit;
 		dbg("sysfs_device->path='%s'", sysfs_device->path);
 		dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
-		dbg("sysfs_device->bus='%s'", sysfs_device->bus);
 	}
 
+	/* execute external program */
+	if (dev->program[0] != '\0') {
+		char program[PROGRAM_SIZE];
+
+		dbg("check " FIELD_PROGRAM);
+		strfieldcpy(program, dev->program);
+		apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
+		if (execute_program(udev, program, udev->program_result, NAME_SIZE) != 0) {
+			dbg(FIELD_PROGRAM " returned nonzero");
+			goto try_parent;
+		}
+		dbg(FIELD_PROGRAM " returned successful");
+	}
+
+	/* check for matching result of external program */
+	if (dev->result[0] != '\0') {
+		dbg("check for " FIELD_RESULT " dev->result='%s', udev->program_result='%s'",
+		    dev->result, udev->program_result);
+		if (strcmp_pattern(dev->result, udev->program_result) != 0) {
+			dbg(FIELD_RESULT " is not matching");
+			goto try_parent;
+		}
+		dbg(FIELD_RESULT " matches");
+	}
+
+	/* rule matches */
+	return 0;
+
+exit:
+	return -1;
 }
 
 int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev)
@@ -696,11 +710,8 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
 	struct sysfs_class_device *class_dev_parent;
 	struct sysfs_device *sysfs_device = NULL;
 	struct config_device *dev;
-	struct perm_device *perm;
-	struct sysinfo info;
 	char *pos;
 
-	udev->mode = 0;
 	dbg("class_dev->name='%s'", class_dev->name);
 
 	/* Figure out where the "device"-symlink is at.  For char devices this will
@@ -720,7 +731,6 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
 		dbg("found devices device: path='%s', bus_id='%s', bus='%s'",
 		    sysfs_device->path, sysfs_device->bus_id, sysfs_device->bus);
 		strfieldcpy(udev->bus_id, sysfs_device->bus_id);
-		strfieldcpy(udev->bus, sysfs_device->bus);
 	}
 
 	strfieldcpy(udev->kernel_name, class_dev->name);
@@ -737,17 +747,54 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
 	/* look for a matching rule to apply */
 	list_for_each_entry(dev, &config_device_list, node) {
 		dbg("process rule");
-		if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
-			if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
-				info("configured rule in '%s' at line %i applied, '%s' is ignored",
+		if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
+
+			/* FIXME: remove old style ignore rule and make OPTION="ignore" mandatory */
+			if (dev->name[0] == '\0' && dev->symlink[0] == '\0' &&
+			    dev->mode == 0000 && dev->owner[0] == '\0' && dev->group[0] == '\0' &&
+			    !dev->ignore_device && !dev->partitions && !dev->ignore_remove) {
+				info("configured rule in '%s[%i]' applied, '%s' is ignored",
+				     dev->config_file, dev->config_line, udev->kernel_name);
+				return -1;
+			}
+
+			/* apply options */
+			if (dev->ignore_device) {
+				info("configured rule in '%s[%i]' applied, '%s' is ignored",
 				     dev->config_file, dev->config_line, udev->kernel_name);
 				return -1;
 			}
+			if (dev->ignore_remove) {
+				udev->ignore_remove = dev->ignore_remove;
+				dbg_parse("remove event should be ignored");
+			}
+			/* apply all_partitions option only at a main block device */
+			if (dev->partitions && udev->type == BLOCK && udev->kernel_number[0] == '\0') {
+				udev->partitions = dev->partitions;
+				dbg("creation of partition nodes requested");
+			}
+
+			/* apply permissions */
+			if (dev->mode != 0000) {
+				udev->mode = dev->mode;
+				dbg("applied mode=%#o to '%s'", udev->mode, udev->kernel_name);
+			}
+			if (dev->owner[0] != '\0') {
+				strfieldcpy(udev->owner, dev->owner);
+				apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
+				dbg("applied owner='%s' to '%s'", udev->owner, udev->kernel_name);
+			}
+			if (dev->group[0] != '\0') {
+				strfieldcpy(udev->group, dev->group);
+				apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
+				dbg("applied group='%s' to '%s'", udev->group, udev->kernel_name);
+			}
 
+			/* collect symlinks for this or the final matching rule */
 			if (dev->symlink[0] != '\0') {
 				char temp[NAME_SIZE];
 
-				info("configured rule in '%s' at line %i applied, added symlink '%s'",
+				info("configured rule in '%s[%i]' applied, added symlink '%s'",
 				     dev->config_file, dev->config_line, dev->symlink);
 				strfieldcpy(temp, dev->symlink);
 				apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
@@ -756,78 +803,35 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
 				strfieldcat(udev->symlink, temp);
 			}
 
+			/* rule matches */
 			if (dev->name[0] != '\0') {
-				/* apply all_partitions flag only at a main block device */
-				if (dev->partitions > 0 &&
-				    (udev->type != 'b' || udev->kernel_number[0] != '\0'))
-					continue;
-
-				info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+				info("configured rule in '%s[%i]' applied, '%s' becomes '%s'",
 				     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
+
 				strfieldcpy(udev->name, dev->name);
-				goto found;
+				apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+				strfieldcpy(udev->config_file, dev->config_file);
+				udev->config_line = dev->config_line;
+
+				if (udev->type != NET)
+					dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
+					    udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
+
+				goto exit;
 			}
 		}
 	}
-	/* no rule was found so we use the kernel name */
-	strfieldcpy(udev->name, udev->kernel_name);
-	if (udev->type == 'n')
-		goto done;
-	else
-		goto perms;
-
-found:
-	apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
-	strfieldcpy(udev->config_file, dev->config_file);
-	udev->config_line = dev->config_line;
-
-	if (udev->type == 'n')
-		goto done;
-
-	udev->partitions = dev->partitions;
-
-	/* get permissions given in rule */
-	set_empty_perms(udev, dev->mode,
-			      dev->owner,
-			      dev->group);
-
-perms:
-	/* get permissions given in config file or set defaults */
-	perm = find_perm(udev->name);
-	if (perm != NULL) {
-		set_empty_perms(udev, perm->mode,
-				      perm->owner,
-				      perm->group);
-	} else {
-		set_empty_perms(udev, get_default_mode(),
-				      get_default_owner(),
-				      get_default_group());
-	}
 
-	dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
-	    udev->name, udev->owner, udev->group, udev->mode);
+	/* no rule matched, so we use the kernel name */
+	strfieldcpy(udev->name, udev->kernel_name);
+	dbg("no rule found, use kernel name '%s'", udev->name);
 
-done:
-	/* store time of action */
-	sysinfo(&info);
-	udev->config_uptime = info.uptime;
+exit:
+	if (udev->tmp_node[0] != '\0') {
+		dbg("removing temporary device node");
+		unlink_secure(udev->tmp_node);
+		udev->tmp_node[0] = '\0';
+	}
 
 	return 0;
 }
-
-int namedev_init(void)
-{
-	int retval;
-
-	retval = namedev_init_rules();
-	if (retval)
-		return retval;
-
-	retval = namedev_init_permissions();
-	if (retval)
-		return retval;
-
-	dump_config_dev_list();
-	dump_perm_dev_list();
-	return retval;
-}