X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=847cc5dade49bdf177082e5f8a4ae88110e70c9d;hp=b395be2abb15e362457a875ba4620900295c1ba5;hb=45a7b668eca398831c0cfc39e4237494b3d603e9;hpb=f130b15645fb41d9dd902b6c96948d344bfe96fa

diff --git a/udev.c b/udev.c
index b395be2ab..847cc5dad 100644
--- a/udev.c
+++ b/udev.c
@@ -3,8 +3,8 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	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
@@ -21,336 +21,211 @@
  *
  */
 
+#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
 #include <ctype.h>
+#include <errno.h>
 #include <signal.h>
-#include <stdarg.h>
+#include <unistd.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_utils.h"
+#include "udev_sysfs.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "namedev.h"
-#include "udevdb.h"
-#include "libsysfs/libsysfs.h"
+#include "logging.h"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
 
-static void sig_handler(int signum)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
 {
-	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");
-	}
-}
+	va_list args;
 
-static inline char *get_action(void)
-{
-	char *action;
+	if (!udev_log)
+		return;
 
-	action = getenv("ACTION");
-	return action;
+	va_start(args, format);
+	vsyslog(level, format, args);
+	va_end(args);
 }
+#endif
 
-static inline char *get_devpath(void)
-{
-	char *devpath;
+/* (for now) true if udevsend is the helper */
+static int manage_hotplug_event(void) {
+	char helper[256];
+	int fd;
+	int len;
 
-	devpath = getenv("DEVPATH");
-	return devpath;
-}
+	fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
+	if (fd < 0)
+		goto exit;
 
-static inline char *get_seqnum(void)
-{
-	char *seqnum;
+	len = read(fd, helper, 256);
+	close(fd);
+
+	if (len < 0)
+		goto exit;
+	helper[len] = '\0';
 
-	seqnum = getenv("SEQNUM");
-	return seqnum;
+	if (strstr(helper, "udevsend"))
+		return 1;
+
+exit:
+	return 0;
 }
 
-static void print_record(char *path, struct udevice *dev)
+static void asmlinkage sig_handler(int signum)
 {
-	printf("P: %s\n", path);
-	printf("N: %s\n", dev->name);
-	printf("S: %s\n", dev->symlink);
-	printf("O: %s\n", dev->owner);
-	printf("G: %s\n", dev->group);
-	printf("\n");
+	switch (signum) {
+		case SIGALRM:
+			exit(1);
+		case SIGINT:
+		case SIGTERM:
+			exit(20 + signum);
+	}
 }
 
-enum query_type {
-	NONE,
-	NAME,
-	SYMLINK,
-	OWNER,
-	GROUP
-};
-
-static inline int udev_user(int argc, char **argv)
+int main(int argc, char *argv[], char *envp[])
 {
-	static const char short_options[] = "dp:q:rVh";
-	int option;
+	struct sigaction act;
+	struct sysfs_class_device *class_dev;
+	struct sysfs_device *devices_dev;
+	struct udevice udev;
+	char path[SYSFS_PATH_MAX];
 	int retval = -EINVAL;
-	struct udevice dev;
-	int root = 0;
-	enum query_type query = NONE;
-	char result[NAME_SIZE] = "";
-	char path[NAME_SIZE] = "";
-
-	/* get command line options */
-	while (1) {
-		option = getopt(argc, argv, short_options);
-		if (option == -1)
-			break;
-
-		dbg("option '%c'", option);
-		switch (option) {
-		case 'p':
-			dbg("udev path: %s\n", optarg);
-			strfieldcpy(path, optarg);
-			break;
-
-		case 'q':
-			dbg("udev query: %s\n", optarg);
-
-			if (strcmp(optarg, "name") == 0) {
-				query = NAME;
-				break;
-			}
-
-			if (strcmp(optarg, "symlink") == 0) {
-				query = SYMLINK;
-				break;
-			}
-
-			if (strcmp(optarg, "owner") == 0) {
-				query = OWNER;
-				break;
-			}
-
-			if (strcmp(optarg, "group") == 0) {
-				query = GROUP;
-				break;
-			}
-
-			printf("unknown query type\n");
-			return -EINVAL;
-
-		case 'r':
-			root = 1;
-			break;
-
-		case 'd':
-			retval = udevdb_open_ro();
-			if (retval != 0) {
-				printf("unable to open udev database\n");
-				return -EACCES;
-			}
-			retval = udevdb_dump(print_record);
-			udevdb_exit();
-			return retval;
-
-		case 'V':
-			printf("udev, version %s\n", UDEV_VERSION);
-			return 0;
-
-		case 'h':
-			retval = 0;
-		case '?':
-		default:
-			goto help;
-		}
-	}
-
-	/* process options */
-	if (query != NONE) {
-		if (path[0] == '\0') {
-			printf("query needs device path specified\n");
-			return -EINVAL;
-		}
+	const char *error;
+	const char *action = getenv("ACTION");
+	const char *devpath = getenv("DEVPATH");
+	const char *subsystem = argv[1];
 
-		retval = udevdb_open_ro();
-		if (retval != 0) {
-			printf("unable to open udev database\n");
-			return -EACCES;
-		}
-		retval = udevdb_get_dev(path, &dev);
-		if (retval == 0) {
-			switch(query) {
-			case NAME:
-				if (root)
-				strfieldcpy(result, udev_root);
-				strncat(result, dev.name, sizeof(result));
-				break;
-
-			case SYMLINK:
-				strfieldcpy(result, dev.symlink);
-				break;
-
-			case GROUP:
-				strfieldcpy(result, dev.group);
-				break;
-
-			case OWNER:
-				strfieldcpy(result, dev.owner);
-				break;
-
-			default:
-				break;
-			}
-			printf("%s\n", result);
-		} else {
-			printf("device not found in udev database\n");
-		}
-		udevdb_exit();
-		return retval;
-	}
+	dbg("version %s", UDEV_VERSION);
+	logging_init("udev");
+	udev_init_config();
 
-	if (root) {
-		printf("%s\n", udev_root);
-		return 0;
-	}
+	/* set signal handlers */
+	act.sa_handler = (void (*) (int))sig_handler;
+	sigemptyset (&act.sa_mask);
+	act.sa_flags = 0;
+	/* alarm must not restart syscalls*/
+	sigaction(SIGALRM, &act, NULL);
+	sigaction(SIGINT, &act, NULL);
+	sigaction(SIGTERM, &act, NULL);
 
-help:
-	printf("Usage: [-pqrdVh]\n"
-	       "  -q TYPE  query database for the specified value:\n"
-	       "             'name'    name of device node\n"
-	       "             'symlink' pointing to node\n"
-	       "             'owner'   of node\n"
-	       "             'group'   of node\n"
-	       "  -p PATH  sysfs device path used for query\n"
-	       "  -r       print udev root\n"
-	       "  -d       dump whole database\n"
-	       "  -V       print udev version\n"
-	       "  -h       print this help text\n"
-	       "\n");
-	return retval;
-}
+	/* trigger timeout to interrupt blocking syscalls */
+	alarm(ALARM_TIMEOUT);
 
-static char *subsystem_blacklist[] = {
-	"net",
-	"scsi_host",
-	"scsi_device",
-	"usb_host",
-	"pci_bus",
-	"",
-};
+	udev_init_device(&udev, devpath, subsystem);
 
-static inline int udev_hotplug(int argc, char **argv)
-{
-	char *action;
-	char *devpath;
-	char *subsystem;
-	int retval = -EINVAL;
-	int i;
+	if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
+		dbg("udevstart");
 
-	subsystem = argv[1];
+		/* disable all logging, as it's much too slow on some facilities */
+		udev_log = 0;
 
-	devpath = get_devpath();
-	if (!devpath) {
-		dbg ("no devpath?");
+		namedev_init();
+		retval = udev_start();
 		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;
+	if (!action) {
+		dbg("no action");
+		goto hotplug;
 	}
 
-	/* 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++;
+	if (!subsystem) {
+		dbg("no subsystem");
+		goto hotplug;
 	}
 
-	action = get_action();
-	if (!action) {
-		dbg ("no action?");
-		goto exit;
+	if (!devpath) {
+		dbg("no devpath");
+		goto hotplug;
 	}
 
-	/* connect to the system message bus */
-	sysbus_connect();
-
-	/* initialize udev database */
-	retval = udevdb_init(UDEVDB_DEFAULT);
-	if (retval != 0) {
-		dbg("unable to initialize database");
-		goto exit_sysbus;
-	}
+	/* export logging flag, as called scripts may want to do the same as udev */
+	if (udev_log)
+		setenv("UDEV_LOG", "1", 1);
 
-	/* set up a default signal handler for now */
-	signal(SIGINT, sig_handler);
-	signal(SIGTERM, sig_handler);
-	signal(SIGKILL, sig_handler);
+	if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) {
+		if (strcmp(action, "add") == 0) {
+			/* wait for sysfs and possibly add node */
+			dbg("udev add");
 
-	/* initialize the naming deamon */
-	namedev_init();
+			/* skip subsystems without "dev", but handle net devices */
+			if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
+				dbg("don't care about '%s' devices", udev.subsystem);
+				goto hotplug;
+			}
 
-	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(devpath, subsystem);
+			snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+			class_dev = wait_class_device_open(path);
+			if (class_dev == NULL) {
+				dbg ("open class device failed");
+				goto hotplug;
+			}
+			dbg("opened class_dev->name='%s'", class_dev->name);
 
-	else if (strcmp(action, "remove") == 0)
-		retval = udev_remove_device(devpath, subsystem);
+			wait_for_class_device(class_dev, &error);
 
-	else {
-		dbg("unknown action '%s'", action);
-		retval = -EINVAL;
-	}
-	udevdb_exit();
+			/* init rules, permissions */
+			namedev_init();
 
-exit_sysbus:
-	/* disconnect from the system message bus */
-	sysbus_disconnect();
+			/* name, create node, store in db */
+			retval = udev_add_device(&udev, class_dev);
 
-exit:
-	if (retval > 0)
-		retval = 0;
+			sysfs_close_class_device(class_dev);
+		} else if (strcmp(action, "remove") == 0) {
+			/* possibly remove a node */
+			dbg("udev remove");
 
-	return -retval;
-}
+			/* skip subsystems without "dev" */
+			if (subsystem_expect_no_dev(udev.subsystem)) {
+				dbg("don't care about '%s' devices", udev.subsystem);
+				goto hotplug;
+			}
 
-int main(int argc, char **argv, char **envp)
-{
-	int retval;
-	main_argv = argv;
-	main_envp = envp;
+			/* get node from db, remove db-entry, delete created node */
+			retval = udev_remove_device(&udev);
+		}
 
-	dbg("version %s", UDEV_VERSION);
+		/* run dev.d/ scripts if we created/deleted a node or changed a netif name */
+		if (udev_dev_d && udev.devname[0] != '\0') {
+			setenv("DEVNAME", udev.devname, 1);
+			udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+		}
+	} else if ((strncmp(devpath, "/devices/", 9) == 0)) {
+		if (strcmp(action, "add") == 0) {
+			/* wait for sysfs */
+			dbg("devices add");
+
+			snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath);
+			devices_dev = wait_devices_device_open(path);
+			if (!devices_dev) {
+				dbg("devices device unavailable (probably remove has beaten us)");
+				goto hotplug;
+			}
+			dbg("devices device opened '%s'", path);
 
-	/* initialize our configuration */
-	udev_init_config();
+			wait_for_devices_device(devices_dev, &error);
 
-	if (argc == 2 && argv[1][0] != '-') {
-		dbg("called by hotplug");
-		retval = udev_hotplug(argc, argv);
+			sysfs_close_device(devices_dev);
+		} else if (strcmp(action, "remove") == 0) {
+			dbg("devices remove");
+		}
 	} else {
-		dbg("called by user");
-		retval = udev_user(argc, argv);
+		dbg("unhandled");
 	}
 
+hotplug:
+	if (udev_hotplug_d && manage_hotplug_event())
+		udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
+
+exit:
+	logging_close();
 	return retval;
 }
-
-