X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=ce6d6ce9df22a7b2cb9ab3bb84133d25906d2d18;hb=bb7386472466e55f75df024d18e8da37a222bb41;hp=116acf538976a070aadaff0ed30187e9dd506747;hpb=f1db055ab2e349ce22254562faaece66d6a4a873;p=elogind.git

diff --git a/udev.c b/udev.c
index 116acf538..ce6d6ce9d 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,16 +23,14 @@
 #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 <stdarg.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"
@@ -42,17 +39,29 @@
 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)
 {
-	dbg("caught signal %d", signum);
 	switch (signum) {
 		case SIGINT:
 		case SIGTERM:
-		case SIGKILL:
 			sysbus_disconnect();
 			udevdb_exit();
 			exit(20 + signum);
-			break;
 		default:
 			dbg("unhandled signal");
 	}
@@ -82,79 +91,29 @@ static inline char *get_seqnum(void)
 	return seqnum;
 }
 
-static inline int udev_user(int argc, char **argv)
-{
-	static const char short_options[] = "q:rVh";
-	int option;
-	int retval = -EINVAL;
-	struct udevice dev;
-
-	while (1) {
-		option = getopt(argc, argv, short_options);
-		if (option == -1)
-			break;
-
-		dbg("option '%c'", option);
-		switch (option) {
-		case 'q':
-			dbg("udev query: %s\n", optarg);
-			retval = udevdb_open_ro();
-			if (retval != 0) {
-				printf("unable to open udev database\n");
-				return -1;
-			}
-			retval = udevdb_get_dev(optarg, &dev);
-			if (retval == 0) {
-				printf("%s\n", dev.name);
-			} else {
-				printf("device not found in udev database\n");
-			}
-			udevdb_exit();
-			return retval;
-
-		case 'r':
-			printf("%s\n", udev_root);
-			return 0;
-
-		case 'V':
-			printf("udev, version %s\n", UDEV_VERSION);
-			return 0;
-
-		case 'h':
-			retval = 0;
-		case '?':
-		default:
-			goto help;
-		}
-	}
-
-help:
-	printf("Usage: [-qrVh]\n"
-	       "  -q <path>  query database for the name of the created node\n"
-	       "  -r         print udev root\n"
-	       "  -V         print udev version\n"
-	       "  -h         print this help text\n"
-	       "\n");
-
-	return retval;
-}
-
 static char *subsystem_blacklist[] = {
 	"net",
 	"scsi_host",
 	"scsi_device",
+	"usb_host",
+	"pci_bus",
 	"",
 };
 
-static inline int udev_hotplug(int argc, char **argv)
+static int udev_hotplug(int argc, char **argv)
 {
 	char *action;
 	char *devpath;
 	char *subsystem;
 	int retval = -EINVAL;
 	int i;
+	struct sigaction act;
 
-	subsystem = argv[1];
+	action = get_action();
+	if (!action) {
+		dbg ("no action?");
+		goto exit;
+	}
 
 	devpath = get_devpath();
 	if (!devpath) {
@@ -171,6 +130,7 @@ static inline int udev_hotplug(int argc, char **argv)
 	}
 
 	/* skip blacklisted subsystems */
+	subsystem = argv[1];
 	i = 0;
 	while (subsystem_blacklist[i][0] != '\0') {
 		if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
@@ -180,15 +140,12 @@ static inline int udev_hotplug(int argc, char **argv)
 		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 */
 	retval = udevdb_init(UDEVDB_DEFAULT);
 	if (retval != 0) {
@@ -197,15 +154,17 @@ static inline int udev_hotplug(int argc, char **argv)
 	}
 
 	/* set up a default signal handler for now */
-	signal(SIGINT, sig_handler);
-	signal(SIGTERM, sig_handler);
-	signal(SIGKILL, sig_handler);
+	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);
@@ -231,22 +190,11 @@ int main(int argc, char **argv, char **envp)
 {
 	main_argv = argv;
 	main_envp = envp;
-	int retval;
 
+	init_logging("udev");
 	dbg("version %s", UDEV_VERSION);
 
-	/* initialize our configuration */
-	udev_init_config();
-
-	if (argc == 2 && argv[1][0] != '-') {
-		dbg("called by hotplug");
-		retval = udev_hotplug(argc, argv);
-	} else {
-		dbg("called by user");
-		retval = udev_user(argc, argv);
-	}
-
-	return retval;
+	return udev_hotplug(argc, argv);
 }