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

diff --git a/udev.c b/udev.c
index 8d650c256..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
@@ -24,27 +23,49 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <unistd.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"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;
 char **main_envp;
 
-char sysfs_path[SYSFS_PATH_MAX];
-char *udev_config_dir;
-char *udev_root;
-char udev_db_filename[PATH_MAX+NAME_MAX];
-char udev_config_permission_filename[PATH_MAX+NAME_MAX];
-char udev_config_filename[PATH_MAX+NAME_MAX];
+#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 inline char *get_action(void)
 {
@@ -70,109 +91,110 @@ static inline char *get_seqnum(void)
 	return seqnum;
 }
 
-static void get_dirs(void)
-{
-	char *udev_test;
-	char *temp;
-	int retval;
-
-	udev_test = getenv("UDEV_TEST");
-	if (udev_test == NULL) {
-		/* normal operation, use the compiled in defaults */
-		udev_config_dir = UDEV_CONFIG_DIR;
-		udev_root = UDEV_ROOT;
-		retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-		dbg("sysfs_path = %s", sysfs_path);
-		if (retval)
-			dbg("sysfs_get_mnt_path failed");
-
-	} else {
-		/* hm testing is happening, use the specified values */
-		temp = getenv("UDEV_SYSFS_PATH");
-		strncpy(sysfs_path, temp, sizeof(sysfs_path));
-		udev_config_dir = getenv("UDEV_CONFIG_DIR");
-		udev_root = getenv("UDEV_ROOT");
-	}
-
-	strncpy(udev_db_filename, udev_config_dir, sizeof(udev_db_filename));
-	strncat(udev_db_filename, UDEV_DB, sizeof(udev_db_filename));
+static char *subsystem_blacklist[] = {
+	"net",
+	"scsi_host",
+	"scsi_device",
+	"usb_host",
+	"pci_bus",
+	"",
+};
 
-	strncpy(udev_config_filename, udev_config_dir, sizeof(udev_config_filename));
-	strncat(udev_config_filename, NAMEDEV_CONFIG_FILE, sizeof(udev_config_filename));
-	
-	strncpy(udev_config_permission_filename, udev_config_dir, sizeof(udev_config_permission_filename));
-	strncat(udev_config_permission_filename, NAMEDEV_CONFIG_PERMISSION_FILE, sizeof(udev_config_permission_filename));
-}
-
-int main(int argc, char **argv, char **envp)
+static int udev_hotplug(int argc, char **argv)
 {
 	char *action;
 	char *devpath;
 	char *subsystem;
 	int retval = -EINVAL;
-	
-	main_argv = argv;
-	main_envp = envp;
-
-	dbg("version %s", UDEV_VERSION);
+	int i;
+	struct sigaction act;
 
-	if (argc != 2) {
-		dbg ("unknown number of arguments");
+	action = get_action();
+	if (!action) {
+		dbg ("no action?");
 		goto exit;
 	}
 
-	subsystem = argv[1];
-
 	devpath = get_devpath();
 	if (!devpath) {
 		dbg ("no devpath?");
 		goto exit;
 	}
-	dbg("looking at %s", devpath);
+	dbg("looking at '%s'", devpath);
 
 	/* we only care about class devices and block stuff */
 	if (!strstr(devpath, "class") &&
 	    !strstr(devpath, "block")) {
-		dbg("not block or class");
+		dbg("not a block or class device");
 		goto exit;
 	}
 
-	/* but we don't care about net class devices */
-	if (strcmp(subsystem, "net") == 0) {
-		dbg("don't care about net devices");
-		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++;
 	}
 
-	action = get_action();
-	if (!action) {
-		dbg ("no action?");
-		goto exit;
-	}
+	/* connect to the system message bus */
+	sysbus_connect();
+
+	/* initialize our configuration */
+	udev_init_config();
 
 	/* initialize udev database */
-	get_dirs();
 	retval = udevdb_init(UDEVDB_DEFAULT);
 	if (retval != 0) {
-		dbg("Unable to initialize database.");
-		goto exit;
+		dbg("unable to initialize database");
+		goto exit_sysbus;
 	}
 
+	/* 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);
+		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);
+		dbg("unknown action '%s'", action);
 		retval = -EINVAL;
 	}
 	udevdb_exit();
 
-exit:	
-	return retval;
+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;
+
+	init_logging("udev");
+	dbg("version %s", UDEV_VERSION);
+
+	return udev_hotplug(argc, argv);
+}
+
+