X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=e6f2744fcbefe0826255550a0879e9f2f1c440a3;hp=227145982ef54da68d913c3a69d332096cfd1367;hb=a551c7b0ceb72145a5256cdd53b0b52ff9f766de;hpb=e9f504e8d896e301099ffc1108a637e2842ee9ba

diff --git a/udev.c b/udev.c
index 227145982..e6f2744fc 100644
--- a/udev.c
+++ b/udev.c
@@ -20,17 +20,18 @@
  *
  */
 
+#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 "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -40,7 +41,7 @@ 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,127 +55,127 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-static void sig_handler(int signum)
+asmlinkage static void sig_handler(int signum)
 {
 	switch (signum) {
 		case SIGINT:
 		case SIGTERM:
-			sysbus_disconnect();
 			udevdb_exit();
 			exit(20 + signum);
 		default:
-			dbg("unhandled signal");
+			dbg("unhandled signal %d", signum);
 	}
 }
 
 static char *subsystem_blacklist[] = {
-	"net",
 	"scsi_host",
 	"scsi_device",
 	"usb_host",
 	"pci_bus",
 	"pcmcia_socket",
-	"",
+	""
 };
 
-static int udev_hotplug(void)
+int main(int argc, char *argv[], char *envp[])
 {
+	main_argv = argv;
+	main_envp = envp;
+	struct sigaction act;
 	char *action;
-	char *devpath;
-	char *subsystem;
-	int retval = -EINVAL;
+	char *devpath = "";
+	char *subsystem = "";
 	int i;
-	struct sigaction act;
+	int retval = -EINVAL;
+	enum {
+		ADD,
+		REMOVE,
+		UDEVSTART,
+	} act_type;
 
-	action = get_action();
-	if (!action) {
-		dbg("no action?");
-		goto exit;
-	}
+	dbg("version %s", UDEV_VERSION);
 
-	devpath = get_devpath();
-	if (!devpath) {
-		dbg("no devpath?");
-		goto exit;
-	}
-	dbg("looking at '%s'", devpath);
+	/* initialize our configuration */
+	udev_init_config();
 
-	/* 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 (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;
+		}
 
-	/* 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);
+		devpath = get_devpath();
+		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;
+		}
 
-	/* initialize udev database */
-	retval = udevdb_init(UDEVDB_DEFAULT);
-	if (retval != 0) {
-		dbg("unable to initialize database");
-		goto exit_sysbus;
+		subsystem = get_subsystem(main_argv[1]);
+		if (!subsystem) {
+			dbg("no subsystem?");
+			goto exit;
+		}
+
+		/* 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++;
+		}
 	}
 
-	/* set up a default signal handler for now */
+	/* set signal handlers */
 	act.sa_handler = sig_handler;
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = SA_RESTART;
 	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);
+	/* initialize udev database */
+	if (udevdb_init(UDEVDB_DEFAULT) != 0) {
+		dbg("unable to initialize database");
+		goto exit;
+	}
 
-	else if (strcmp(action, "remove") == 0)
+	switch(act_type) {
+	case UDEVSTART:
+		dbg("udevstart");
+		namedev_init();
+		udev_sleep = 0;
+		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);
-
-	else {
-		dbg("unknown action '%s'", action);
-		retval = -EINVAL;
 	}
-	udevdb_exit();
 
-exit_sysbus:
-	/* disconnect from the system message bus */
-	sysbus_disconnect();
+	udevdb_exit();
 
 exit:
-	if (retval > 0)
-		retval = 0;
-
-	return -retval;
-}
-
-int main(int argc, char **argv, char **envp)
-{
-	main_argv = argv;
-	main_envp = envp;
-
-	init_logging("udev");
-
-	/* initialize our configuration */
-	udev_init_config();
-
-	dbg("version %s", UDEV_VERSION);
-
-	return udev_hotplug();
+	return retval;
 }