X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=10a937e4724f54bc69d609960b8799916f7dc182;hp=e6f2744fcbefe0826255550a0879e9f2f1c440a3;hb=7257cb18458e6b51cc9655887b7f9745f704b71f;hpb=6d74f9967b54104895e49c05549121026515fa58

diff --git a/udev.c b/udev.c
index e6f2744fc..10a937e47 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,6 +37,9 @@
 #include "namedev.h"
 #include "udevdb.h"
 
+/* timeout flag for udevdb */
+extern sig_atomic_t gotalarm;
+
 /* global variables */
 char **main_argv;
 char **main_envp;
@@ -55,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();
@@ -67,24 +75,41 @@ 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;
+	}
+
+	return 0;
+}
 
 int main(int argc, char *argv[], char *envp[])
 {
-	main_argv = argv;
-	main_envp = envp;
 	struct sigaction act;
 	char *action;
 	char *devpath = "";
 	char *subsystem = "";
-	int i;
 	int retval = -EINVAL;
 	enum {
 		ADD,
@@ -94,7 +119,11 @@ int main(int argc, char *argv[], char *envp[])
 
 	dbg("version %s", UDEV_VERSION);
 
-	/* initialize our configuration */
+	main_argv = argv;
+	main_envp = envp;
+
+	logging_init("udev");
+
 	udev_init_config();
 
 	if (strstr(argv[0], "udevstart")) {
@@ -134,34 +163,31 @@ int main(int argc, char *argv[], char *envp[])
 		}
 
 		/* skip blacklisted subsystems */
-		i = 0;
-		while (subsystem_blacklist[i][0] != '\0') {
-			if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
-				dbg("don't care about '%s' devices", subsystem);
-				goto exit;
-			}
-			i++;
-		}
+		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);
 
+	/* trigger timout to interrupt blocking syscalls */
+	alarm(ALARM_TIMEOUT);
+
 	/* initialize udev database */
-	if (udevdb_init(UDEVDB_DEFAULT) != 0) {
-		dbg("unable to initialize database");
-		goto exit;
-	}
+	if (udevdb_init(UDEVDB_DEFAULT) != 0)
+		info("error: unable to initialize database, continuing without database");
 
 	switch(act_type) {
 	case UDEVSTART:
 		dbg("udevstart");
 		namedev_init();
-		udev_sleep = 0;
 		retval = udev_start();
 		break;
 	case ADD:
@@ -177,5 +203,6 @@ int main(int argc, char *argv[], char *envp[])
 	udevdb_exit();
 
 exit:
+	logging_close();
 	return retval;
 }