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

diff --git a/udev.c b/udev.c
index 4ae468453..300e85ceb 100644
--- a/udev.c
+++ b/udev.c
@@ -20,27 +20,27 @@
  *
  */
 
+#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <errno.h>
 #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 "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
 
 #ifdef LOG
-unsigned char logname[42];
+unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
 {
 	va_list args;
@@ -54,126 +54,133 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-static void sig_handler(int signum)
+static void asmlinkage sig_handler(int signum)
 {
 	switch (signum) {
+		case SIGALRM:
+			exit(1);
 		case SIGINT:
 		case SIGTERM:
-			sysbus_disconnect();
-			udevdb_exit();
 			exit(20 + signum);
-		default:
-			dbg("unhandled signal");
 	}
 }
 
-static char *subsystem_blacklist[] = {
-	"net",
-	"scsi_host",
-	"scsi_device",
-	"usb_host",
-	"pci_bus",
-	"",
-};
-
-static int udev_hotplug(void)
+int main(int argc, char *argv[], char *envp[])
 {
-	char *action;
-	char *devpath;
-	char *subsystem;
-	int retval = -EINVAL;
-	int i;
 	struct sigaction act;
+	struct sysfs_class_device *class_dev;
+	struct udevice udev;
+	char path[SYSFS_PATH_MAX];
+	int retval = -EINVAL;
+	enum {
+		ADD,
+		REMOVE,
+		UDEVSTART,
+	} act_type;
 
-	action = get_action();
-	if (!action) {
-		dbg("no action?");
-		goto exit;
-	}
+	dbg("version %s", UDEV_VERSION);
+	logging_init("udev");
+	udev_init_config();
 
-	devpath = get_devpath();
-	if (!devpath) {
-		dbg("no devpath?");
-		goto exit;
-	}
-	dbg("looking at '%s'", devpath);
+	if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
+		act_type = UDEVSTART;
+	} else {
+		const char *action = getenv("ACTION");
+		const char *devpath = getenv("DEVPATH");
+		const char *subsystem = argv[1];
 
-	/* 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;
-	}
+		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("no action '%s' for us", action);
+			goto exit;
+		}
 
-	/* skip blacklisted subsystems */
-	subsystem = get_subsystem(main_argv[1]);
-	if (!subsystem) {
-		dbg("no subsystem?");
-		goto exit;
-	}
-	i = 0;
-	while (subsystem_blacklist[i][0] != '\0') {
-		if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
-			dbg("don't care about '%s' devices", subsystem);
+		if (!devpath) {
+			dbg("no devpath?");
 			goto exit;
 		}
-		i++;
-	}
+		dbg("looking at '%s'", devpath);
 
-	/* connect to the system message bus */
-	sysbus_connect();
+		/* 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;
+		}
+
+		if (!subsystem) {
+			dbg("no subsystem");
+			goto exit;
+		}
+
+		udev_set_values(&udev, devpath, subsystem, action);
+
+		/* skip blacklisted subsystems */
+		if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
+			dbg("don't care about '%s' devices", subsystem);
+			goto exit;
+		};
 
-	/* initialize udev database */
-	retval = udevdb_init(UDEVDB_DEFAULT);
-	if (retval != 0) {
-		dbg("unable to initialize database");
-		goto exit_sysbus;
 	}
 
-	/* set up a default signal handler for now */
-	act.sa_handler = sig_handler;
+	/* set signal handlers */
+	act.sa_handler = (void (*) (int))sig_handler;
 	sigemptyset (&act.sa_mask);
-	act.sa_flags = SA_RESTART;
+	act.sa_flags = 0;
+	/* alarm must not restart syscalls*/
+	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	/* initialize the naming deamon */
-	namedev_init();
-
-	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(devpath, subsystem, 0);
-
-	else if (strcmp(action, "remove") == 0)
-		retval = udev_remove_device(devpath, subsystem);
-
-	else {
-		dbg("unknown action '%s'", action);
-		retval = -EINVAL;
-	}
-	udevdb_exit();
+	/* trigger timout to interrupt blocking syscalls */
+	alarm(ALARM_TIMEOUT);
+
+	switch(act_type) {
+	case UDEVSTART:
+		dbg("udevstart");
+		namedev_init();
+		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);
 
-exit_sysbus:
-	/* disconnect from the system message bus */
-	sysbus_disconnect();
+		/* init rules */
+		namedev_init();
 
-exit:
-	if (retval > 0)
-		retval = 0;
-
-	return -retval;
-}
+		/* name, create node, store in db */
+		retval = udev_add_device(&udev, class_dev);
 
-int main(int argc, char **argv, char **envp)
-{
-	main_argv = argv;
-	main_envp = envp;
+		/* run scripts */
+		dev_d_execute(&udev);
 
-	init_logging("udev");
+		sysfs_close_class_device(class_dev);
+		break;
+	case REMOVE:
+		dbg("udev remove");
 
-	/* initialize our configuration */
-	udev_init_config();
+		/* get node from db, delete it*/
+		retval = udev_remove_device(&udev);
 
-	dbg("version %s", UDEV_VERSION);
+		/* run scripts */
+		dev_d_execute(&udev);
+	}
 
-	return udev_hotplug();
+exit:
+	logging_close();
+	return retval;
 }