X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=300e85ceb0aa0737c74f589cc39de53e43ed6f41;hp=974b9582d0723440f218249263ee82f1c1f5ae3c;hb=af4b05d4917fdfa55eff3d8d53a830464d8162a1;hpb=7e89a569cc4db0c1482662dc4df5f60df7aef3ff

diff --git a/udev.c b/udev.c
index 974b9582d..300e85ceb 100644
--- a/udev.c
+++ b/udev.c
@@ -27,21 +27,17 @@
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
 
 #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;
-
-/* global variables */
-char **main_argv;
-char **main_envp;
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -58,40 +54,23 @@ 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;
+			exit(1);
 		case SIGINT:
 		case SIGTERM:
-			udevdb_exit();
 			exit(20 + signum);
-		default:
-			dbg("unhandled signal %d", signum);
 	}
 }
 
-static char *subsystem_blacklist[] = {
-	"scsi_host",
-	"scsi_device",
-	"usb_host",
-	"pci_bus",
-	"pcmcia_socket",
-	""
-};
-
 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;
+	struct sysfs_class_device *class_dev;
+	struct udevice udev;
+	char path[SYSFS_PATH_MAX];
 	int retval = -EINVAL;
 	enum {
 		ADD,
@@ -100,15 +79,16 @@ int main(int argc, char *argv[], char *envp[])
 	} act_type;
 
 	dbg("version %s", UDEV_VERSION);
-
-	init_logging("udev");
-
+	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 {
-		action = get_action();
+		const char *action = getenv("ACTION");
+		const char *devpath = getenv("DEVPATH");
+		const char *subsystem = argv[1];
+
 		if (!action) {
 			dbg("no action?");
 			goto exit;
@@ -118,11 +98,10 @@ int main(int argc, char *argv[], char *envp[])
 		} else if (strcmp(action, "remove") == 0) {
 			act_type = REMOVE;
 		} else {
-			dbg("unknown action '%s'", action);
+			dbg("no action '%s' for us", action);
 			goto exit;
 		}
 
-		devpath = get_devpath();
 		if (!devpath) {
 			dbg("no devpath?");
 			goto exit;
@@ -135,28 +114,26 @@ int main(int argc, char *argv[], char *envp[])
 			goto exit;
 		}
 
-		subsystem = get_subsystem(main_argv[1]);
 		if (!subsystem) {
-			dbg("no subsystem?");
+			dbg("no subsystem");
 			goto exit;
 		}
 
+		udev_set_values(&udev, devpath, subsystem, action);
+
 		/* 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 (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
+			dbg("don't care about '%s' devices", subsystem);
+			goto exit;
+		};
+
 	}
 
 	/* set signal handlers */
-	act.sa_handler = sig_handler;
-
+	act.sa_handler = (void (*) (int))sig_handler;
 	sigemptyset (&act.sa_mask);
-	/* alarm must interrupt syscalls*/
+	act.sa_flags = 0;
+	/* alarm must not restart syscalls*/
 	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
@@ -164,29 +141,46 @@ 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");
 		namedev_init();
-		udev_sleep = 0;
 		retval = udev_start();
 		break;
 	case ADD:
 		dbg("udev add");
+
+		/* open the device */
+		snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+		class_dev = sysfs_open_class_device_path(path);
+		if (class_dev == NULL) {
+			dbg ("sysfs_open_class_device_path failed");
+			break;
+		}
+		dbg("opened class_dev->name='%s'", class_dev->name);
+
+		/* init rules */
 		namedev_init();
-		retval = udev_add_device(devpath, subsystem, NOFAKE);
+
+		/* name, create node, store in db */
+		retval = udev_add_device(&udev, class_dev);
+
+		/* run scripts */
+		dev_d_execute(&udev);
+
+		sysfs_close_class_device(class_dev);
 		break;
 	case REMOVE:
 		dbg("udev remove");
-		retval = udev_remove_device(devpath, subsystem);
-	}
 
-	udevdb_exit();
+		/* get node from db, delete it*/
+		retval = udev_remove_device(&udev);
+
+		/* run scripts */
+		dev_d_execute(&udev);
+	}
 
 exit:
+	logging_close();
 	return retval;
 }