X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=a41f22277880be604ab4beef193847373110bbd0;hb=2092fbcdebf5313f29b43bdaa57a22baf0c0269f;hp=839bfa6520299461e63d6261d01a2bc173df15d7;hpb=1ceba9360b4de2f9ad3f20c23133bbfec027c036;p=elogind.git

diff --git a/udev.c b/udev.c
index 839bfa652..a41f22277 100644
--- a/udev.c
+++ b/udev.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -33,17 +32,11 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_lib.h"
+#include "udev_sysfs.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
-
-/* timeout flag for udevdb */
-extern sig_atomic_t gotalarm;
+#include "logging.h"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -64,45 +57,11 @@ static void asmlinkage sig_handler(int signum)
 {
 	switch (signum) {
 		case SIGALRM:
-			gotalarm = 1;
-			info("error: timeout reached, event probably not handled correctly");
-			break;
+			exit(1);
 		case SIGINT:
 		case SIGTERM:
-			udevdb_exit();
 			exit(20 + signum);
-		default:
-			dbg("unhandled signal %d", signum);
-	}
-}
-
-/* list of subsystems we don't care about. not listing such systems here
- * is not critical, but it makes it faster as we don't look for the "dev" file
- */
-static int subsystem_without_dev(const char *subsystem)
-{
-	char *subsystem_blacklist[] = {
-		"scsi_host",
-		"scsi_device",
-		"usb_host",
-		"pci_bus",
-		"pcmcia_socket",
-		"bluetooth",
-		"i2c-adapter",
-		"pci_bus",
-		"ieee1394",
-		"ieee1394_host",
-		"ieee1394_node",
-		NULL
-	};
-	char **subsys;
-
-	for (subsys = subsystem_blacklist; *subsys != NULL; subsys++) {
-		if (strcmp(subsystem, *subsys) == 0)
-			return 1;
 	}
-
-	return 0;
 }
 
 int main(int argc, char *argv[], char *envp[])
@@ -119,20 +78,15 @@ int main(int argc, char *argv[], char *envp[])
 	} act_type;
 
 	dbg("version %s", UDEV_VERSION);
-
-	main_argv = argv;
-	main_envp = envp;
-
 	logging_init("udev");
-
 	udev_init_config();
 
-	if (strstr(argv[0], "udevstart")) {
+	if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
 		act_type = UDEVSTART;
 	} else {
-		const char *action = get_action();
-		const char *devpath = get_devpath();
-		const char *subsystem = get_subsystem(main_argv[1]);
+		const char *action = getenv("ACTION");
+		const char *devpath = getenv("DEVPATH");
+		const char *subsystem = argv[1];
 
 		if (!action) {
 			dbg("no action?");
@@ -151,7 +105,7 @@ int main(int argc, char *argv[], char *envp[])
 			dbg("no devpath?");
 			goto exit;
 		}
-		dbg("looking at '%s'", udev.devpath);
+		dbg("looking at '%s'", devpath);
 
 		/* we only care about class devices and block stuff */
 		if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
@@ -164,18 +118,20 @@ int main(int argc, char *argv[], char *envp[])
 			goto exit;
 		}
 
+		udev_set_values(&udev, devpath, subsystem, action);
+
 		/* skip blacklisted subsystems */
-		if (subsystem_without_dev(subsystem)) {
+		if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
 			dbg("don't care about '%s' devices", subsystem);
 			goto exit;
 		};
 
-		udev_set_values(&udev, devpath, subsystem);
 	}
 
 	/* set signal handlers */
 	act.sa_handler = (void (*) (int))sig_handler;
 	sigemptyset (&act.sa_mask);
+	act.sa_flags = 0;
 	/* alarm must not restart syscalls*/
 	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
@@ -184,10 +140,6 @@ int main(int argc, char *argv[], char *envp[])
 	/* trigger timout to interrupt blocking syscalls */
 	alarm(ALARM_TIMEOUT);
 
-	/* initialize udev database */
-	if (udevdb_init(UDEVDB_DEFAULT) != 0)
-		info("error: unable to initialize database, continuing without database");
-
 	switch(act_type) {
 	case UDEVSTART:
 		dbg("udevstart");
@@ -197,9 +149,6 @@ int main(int argc, char *argv[], char *envp[])
 	case ADD:
 		dbg("udev add");
 
-		/* init rules */
-		namedev_init();
-
 		/* open the device */
 		snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
 		class_dev = sysfs_open_class_device_path(path);
@@ -209,11 +158,17 @@ int main(int argc, char *argv[], char *envp[])
 		}
 		dbg("opened class_dev->name='%s'", class_dev->name);
 
+		/* init rules */
+		namedev_init();
+
 		/* name, create node, store in db */
 		retval = udev_add_device(&udev, class_dev);
 
-		/* run scripts */
-		dev_d_execute(&udev);
+		/* run dev.d/ scripts if we created a node or changed a netif name */
+		if (udev.devname[0] != '\0') {
+			setenv("DEVNAME", udev.devname, 1);
+			dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+		}
 
 		sysfs_close_class_device(class_dev);
 		break;
@@ -224,11 +179,9 @@ int main(int argc, char *argv[], char *envp[])
 		retval = udev_remove_device(&udev);
 
 		/* run scripts */
-		dev_d_execute(&udev);
+		dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
 	}
 
-	udevdb_exit();
-
 exit:
 	logging_close();
 	return retval;