X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=d98a017396e0b33fa896d9336fcaf7ed289de011;hp=90c34d800a9ca22533f276bf475cd7dc6a450e3a;hb=707680b1cf08369da365de1a5e06089621ff8c77;hpb=2410242aa4d21335026d3b90116078c9146a32f3

diff --git a/udev.c b/udev.c
index 90c34d800..d98a01739 100644
--- a/udev.c
+++ b/udev.c
@@ -20,6 +20,7 @@
  *
  */
 
+#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -36,13 +37,13 @@
 #include "namedev.h"
 #include "udevdb.h"
 
+/* timeout flag for udevdb */
+extern sig_atomic_t gotalarm;
+
 /* global variables */
 char **main_argv;
 char **main_envp;
 
-/* local variables */
-static int is_udevstart;
-
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
@@ -58,9 +59,13 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-asmlinkage static void sig_handler(int signum)
+static void asmlinkage sig_handler(int signum)
 {
 	switch (signum) {
+		case SIGALRM:
+			gotalarm = 1;
+			info("error: timeout reached, event probably not handled correctly");
+			break;
 		case SIGINT:
 		case SIGTERM:
 			udevdb_exit();
@@ -70,124 +75,132 @@ asmlinkage static void sig_handler(int signum)
 	}
 }
 
-static char *subsystem_blacklist[] = {
-	"scsi_host",
-	"scsi_device",
-	"usb_host",
-	"pci_bus",
-	"pcmcia_socket",
-	""
-};
+/* 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;
+	}
 
-int __udev_hotplug(char *action, const char *devpath, const char *subsystem)
+	return 0;
+}
+
+int main(int argc, char *argv[], char *envp[])
 {
-	int retval = -EINVAL;
-	int i;
+	main_argv = argv;
+	main_envp = envp;
 	struct sigaction act;
-	const int nofake = 0;
+	char *action;
+	char *devpath = "";
+	char *subsystem = "";
+	int retval = -EINVAL;
+	enum {
+		ADD,
+		REMOVE,
+		UDEVSTART,
+	} act_type;
 
-	dbg("looking at '%s'", devpath);
+	dbg("version %s", UDEV_VERSION);
 
-	/* we only care about class devices and block stuff */
-	if (!strstr(devpath, "class") &&
-	    !strstr(devpath, "block")) {
-		dbg("not a block or class device");
-		goto exit;
-	}
+	init_logging("udev");
 
-	i = 0;
-	while (subsystem_blacklist[i][0] != '\0') {
-		if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
-			dbg("don't care about '%s' devices", subsystem);
+	udev_init_config();
+
+	if (strstr(argv[0], "udevstart")) {
+		act_type = UDEVSTART;
+	} else {
+		action = get_action();
+		if (!action) {
+			dbg("no action?");
+			goto exit;
+		}
+		if (strcmp(action, "add") == 0) {
+			act_type = ADD;
+		} else if (strcmp(action, "remove") == 0) {
+			act_type = REMOVE;
+		} else {
+			dbg("unknown action '%s'", action);
 			goto exit;
 		}
-		i++;
-	}
 
-	/* initialize udev database */
-	retval = udevdb_init(UDEVDB_DEFAULT);
-	if (retval != 0) {
-		dbg("unable to initialize database");
-		goto exit;
+		devpath = get_devpath();
+		if (!devpath) {
+			dbg("no devpath?");
+			goto exit;
+		}
+		dbg("looking at '%s'", devpath);
+
+		/* we only care about class devices and block stuff */
+		if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
+			dbg("not a block or class device");
+			goto exit;
+		}
+
+		subsystem = get_subsystem(main_argv[1]);
+		if (!subsystem) {
+			dbg("no subsystem?");
+			goto exit;
+		}
+
+		/* skip blacklisted subsystems */
+		if (subsystem_without_dev(subsystem)) {
+			dbg("don't care about '%s' devices", subsystem);
+			exit(0);
+		};
 	}
 
 	/* set signal handlers */
-	act.sa_handler = sig_handler;
+	act.sa_handler = (void (*) (int))sig_handler;
 	sigemptyset (&act.sa_mask);
-	act.sa_flags = SA_RESTART;
+	/* alarm must not restart syscalls*/
+	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	if (strcmp(action, "add") == 0) {
-		/* Already done. */
-		if (!is_udevstart)
-			namedev_init();
-		retval = udev_add_device(devpath, subsystem, nofake);
-		goto action_done;
-	}
+	/* 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");
 
-	if (strcmp(action, "remove") == 0) {
+	switch(act_type) {
+	case UDEVSTART:
+		dbg("udevstart");
+		namedev_init();
+		retval = udev_start();
+		break;
+	case ADD:
+		dbg("udev add");
+		namedev_init();
+		retval = udev_add_device(devpath, subsystem, NOFAKE);
+		break;
+	case REMOVE:
+		dbg("udev remove");
 		retval = udev_remove_device(devpath, subsystem);
-		goto action_done;
 	}
 
-	dbg("unknown action '%s'", action);
-	retval = -EINVAL;
-
-action_done:
 	udevdb_exit();
 
 exit:
 	return retval;
 }
-
-static int udev_hotplug(void)
-{
-	char *action;
-	char *devpath;
-	char *subsystem;
-
-	action = get_action();
-	if (!action) {
-		dbg("no action?");
-		return -EINVAL;
-	}
-
-	devpath = get_devpath();
-	if (!devpath) {
-		dbg("no devpath?");
-		return -EINVAL;
-	}
-
-	/* skip blacklisted subsystems */
-	subsystem = get_subsystem(main_argv[1]);
-	if (!subsystem) {
-		dbg("no subsystem?");
-		return -EINVAL;
-	}
-
-	return __udev_hotplug(action, devpath, subsystem);
-}
-
-int main(int argc, char *argv[], char *envp[])
-{
-	main_argv = argv;
-	main_envp = envp;
-
-	if (strstr(argv[0], "udevstart")) {
-		/* Setup env variables. */
-		setenv("UDEV_NO_SLEEP", "1", 1);
-		is_udevstart = 1;
-	}
-
-	/* initialize our configuration */
-	udev_init_config();
-
-	dbg("version %s", UDEV_VERSION);
-
-	if (is_udevstart) {
-		namedev_init();
-		return udev_start();
-	} else
-		return udev_hotplug();
-}