X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=f3fab18b29e3fe000f214f38d0cfd0dfc8ee88fa;hp=1ac1c985076be16e6d1eab73fdd65d7b58cb7d33;hb=e59d338c9685985fa9aed890cbb8bf3bb17160ee;hpb=f0083e3d4eb49e11fd7e37532dc64a6e6f5d4039

diff --git a/udev.c b/udev.c
index 1ac1c9850..f3fab18b2 100644
--- a/udev.c
+++ b/udev.c
@@ -3,8 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -23,11 +22,52 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+#include <signal.h>
+#include <sysfs/libsysfs.h>
+
 #include "udev.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];
+void log_message (int level, const char *format, ...)
+{
+	va_list	args;
+
+	if (!udev_log)
+		return;
+
+	va_start(args, format);
+	vsyslog(level, format, args);
+	va_end(args);
+}
+#endif
 
+static void sig_handler(int signum)
+{
+	switch (signum) {
+		case SIGINT:
+		case SIGTERM:
+			sysbus_disconnect();
+			udevdb_exit();
+			exit(20 + signum);
+		default:
+			dbg("unhandled signal");
+	}
+}
 
-static char *get_action(void)
+static inline char *get_action(void)
 {
 	char *action;
 
@@ -35,49 +75,126 @@ static char *get_action(void)
 	return action;
 }
 
+static inline char *get_devpath(void)
+{
+	char *devpath;
 
-/* yeah this should be dynamically allocated... */
-static char device[255];
+	devpath = getenv("DEVPATH");
+	return devpath;
+}
 
-static char *get_device(void)
+static inline char *get_seqnum(void)
 {
-	char *temp;
-
-	temp = getenv("DEVPATH");
-	if (temp == NULL)
-		return NULL;
-	strcpy(device, SYSFS_ROOT);
-	strcat(device, temp);
+	char *seqnum;
 
-	return device;
+	seqnum = getenv("SEQNUM");
+	return seqnum;
 }
 
+static char *subsystem_blacklist[] = {
+	"net",
+	"scsi_host",
+	"scsi_device",
+	"usb_host",
+	"pci_bus",
+	"",
+};
 
-int main(int argc, char *argv[])
+static int udev_hotplug(int argc, char **argv)
 {
-	char *subsystem;
 	char *action;
-	char *dev;
-	
-	if (argc != 2) {
-		dbg ("unknown number of arguments");
-		return 1;
-	}
-
-	subsystem = argv[1];
+	char *devpath;
+	char *subsystem;
+	int retval = -EINVAL;
+	int i;
+	struct sigaction act;
 
 	action = get_action();
 	if (!action) {
 		dbg ("no action?");
-		return 1;
+		goto exit;
+	}
+
+	devpath = get_devpath();
+	if (!devpath) {
+		dbg ("no devpath?");
+		goto exit;
+	}
+	dbg("looking at '%s'", devpath);
+
+	/* 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;
+	}
+
+	/* skip blacklisted subsystems */
+	subsystem = argv[1];
+	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++;
+	}
+
+	/* connect to the system message bus */
+	sysbus_connect();
+
+	/* initialize our configuration */
+	udev_init_config();
+
+	/* initialize udev database */
+	retval = udevdb_init(UDEVDB_DEFAULT);
+	if (retval != 0) {
+		dbg("unable to initialize database");
+		goto exit_sysbus;
 	}
 
-	dev = get_device();
-	if (!dev) {
-		dbg ("no device?");
-		return 1;
+	/* set up a default signal handler for now */
+	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);
+
+	else if (strcmp(action, "remove") == 0)
+		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();
+
+exit:
+	if (retval > 0)
+		retval = 0;
+
+	return -retval;
+}
+
+int main(int argc, char **argv, char **envp)
+{
+	main_argv = argv;
+	main_envp = envp;
 
-	return 0;
+	init_logging("udev");
+	dbg("version %s", UDEV_VERSION);
+
+	return udev_hotplug(argc, argv);
 }
 
+