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

diff --git a/udev.c b/udev.c
index d7fa32757..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>
@@ -74,24 +75,41 @@ static void asmlinkage 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,
@@ -101,7 +119,10 @@ int main(int argc, char *argv[], char *envp[])
 
 	dbg("version %s", UDEV_VERSION);
 
-	init_logging("udev");
+	main_argv = argv;
+	main_envp = envp;
+
+	logging_init("udev");
 
 	udev_init_config();
 
@@ -142,20 +163,16 @@ 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 = (void (*) (int))sig_handler;
 	sigemptyset (&act.sa_mask);
-	/* alarm must interrupt syscalls*/
+	/* alarm must not restart syscalls*/
 	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
@@ -171,7 +188,6 @@ int main(int argc, char *argv[], char *envp[])
 	case UDEVSTART:
 		dbg("udevstart");
 		namedev_init();
-		udev_sleep = 0;
 		retval = udev_start();
 		break;
 	case ADD:
@@ -187,5 +203,6 @@ int main(int argc, char *argv[], char *envp[])
 	udevdb_exit();
 
 exit:
+	logging_close();
 	return retval;
 }