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

diff --git a/udev.c b/udev.c
index a562bc27b..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,170 +21,211 @@
  *
  */
 
+#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <ctype.h>
 #include <errno.h>
+#include <signal.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 "namedev.h"
-#include "udevdb.h"
-#include "libsysfs/libsysfs.h"
-
-/* global variables */
-char **main_argv;
-char **main_envp;
+#include "logging.h"
 
-char sysfs_path[SYSFS_PATH_MAX];
-char *udev_config_dir = UDEV_CONFIG_DIR;
-char *udev_root = 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];
 
-
-static inline char *get_action(void)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
 {
-	char *action;
+	va_list args;
+
+	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);
 
-	seqnum = getenv("SEQNUM");
-	return seqnum;
+	if (len < 0)
+		goto exit;
+	helper[len] = '\0';
+
+	if (strstr(helper, "udevsend"))
+		return 1;
+
+exit:
+	return 0;
 }
 
-static void get_dirs(void)
+static void asmlinkage sig_handler(int signum)
 {
-	char *temp;
-	char *udev_db = UDEV_DB;
-	char *udev_config = UDEV_CONFIG_FILE;
-	char *udev_permission = UDEV_CONFIG_PERMISSION_FILE;
-	int retval;
-
-	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-	if (retval)
-		dbg("sysfs_get_mnt_path failed");
-
-	/* see if we should try to override any of the default values */
-	temp = getenv("UDEV_TEST");
-	if (temp != NULL) {
-		/* hm testing is happening, use the specified values, if they are present */
-		temp = getenv("SYSFS_PATH");
-		if (temp)
-			strncpy(sysfs_path, temp, sizeof(sysfs_path));
-		temp = getenv("UDEV_CONFIG_DIR");
-		if (temp)
-			udev_config_dir = temp;
-		temp = getenv("UDEV_ROOT");
-		if (temp)
-			udev_root = temp;
-		temp = getenv("UDEV_DB");
-		if (temp)
-			udev_db = temp;
-		temp = getenv("UDEV_CONFIG_FILE");
-		if (temp)
-			udev_config = temp;
-		temp = getenv("UDEV_PERMISSION_FILE");
-		if (temp)
-			udev_permission = temp;
+	switch (signum) {
+		case SIGALRM:
+			exit(1);
+		case SIGINT:
+		case SIGTERM:
+			exit(20 + signum);
 	}
-	dbg("sysfs_path='%s'", sysfs_path);
-
-	strncpy(udev_db_filename, udev_config_dir, sizeof(udev_db_filename));
-	strncat(udev_db_filename, udev_db, sizeof(udev_db_filename));
-
-	strncpy(udev_config_filename, udev_config_dir, sizeof(udev_config_filename));
-	strncat(udev_config_filename, udev_config, sizeof(udev_config_filename));
-	
-	strncpy(udev_config_permission_filename, udev_config_dir, sizeof(udev_config_permission_filename));
-	strncat(udev_config_permission_filename, udev_permission, sizeof(udev_config_permission_filename));
 }
 
-int main(int argc, char **argv, char **envp)
+int main(int argc, char *argv[], char *envp[])
 {
-	char *action;
-	char *devpath;
-	char *subsystem;
+	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;
-	
-	main_argv = argv;
-	main_envp = envp;
+	const char *error;
+	const char *action = getenv("ACTION");
+	const char *devpath = getenv("DEVPATH");
+	const char *subsystem = argv[1];
 
 	dbg("version %s", UDEV_VERSION);
+	logging_init("udev");
+	udev_init_config();
 
-	if (argc != 2) {
-		dbg ("unknown number of arguments");
-		goto exit;
-	}
+	/* 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);
 
-	subsystem = argv[1];
+	/* trigger timeout to interrupt blocking syscalls */
+	alarm(ALARM_TIMEOUT);
 
-	devpath = get_devpath();
-	if (!devpath) {
-		dbg ("no devpath?");
-		goto exit;
-	}
-	dbg("looking at '%s'", devpath);
+	udev_init_device(&udev, devpath, subsystem);
 
-	/* 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") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
+		dbg("udevstart");
 
-	/* but we don't care about net class devices */
-	if (strcmp(subsystem, "net") == 0) {
-		dbg("don't care about net devices");
+		/* disable all logging, as it's much too slow on some facilities */
+		udev_log = 0;
+
+		namedev_init();
+		retval = udev_start();
 		goto exit;
 	}
 
-	action = get_action();
 	if (!action) {
-		dbg ("no action?");
-		goto exit;
+		dbg("no action");
+		goto hotplug;
 	}
 
-	/* initialize udev database */
-	get_dirs();
-	retval = udevdb_init(UDEVDB_DEFAULT);
-	if (retval != 0) {
-		dbg("unable to initialize database");
-		goto exit;
+	if (!subsystem) {
+		dbg("no subsystem");
+		goto hotplug;
 	}
 
-	/* initialize the naming deamon */
-	namedev_init();
-
-	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(devpath, subsystem);
-
-	else if (strcmp(action, "remove") == 0)
-		retval = udev_remove_device(devpath, subsystem);
+	if (!devpath) {
+		dbg("no devpath");
+		goto hotplug;
+	}
 
-	else {
-		dbg("unknown action '%s'", action);
-		retval = -EINVAL;
+	/* export logging flag, as called scripts may want to do the same as udev */
+	if (udev_log)
+		setenv("UDEV_LOG", "1", 1);
+
+	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");
+
+			/* 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;
+			}
+
+			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);
+
+			wait_for_class_device(class_dev, &error);
+
+			/* init rules, permissions */
+			namedev_init();
+
+			/* name, create node, store in db */
+			retval = udev_add_device(&udev, class_dev);
+
+			sysfs_close_class_device(class_dev);
+		} else if (strcmp(action, "remove") == 0) {
+			/* possibly remove a node */
+			dbg("udev remove");
+
+			/* skip subsystems without "dev" */
+			if (subsystem_expect_no_dev(udev.subsystem)) {
+				dbg("don't care about '%s' devices", udev.subsystem);
+				goto hotplug;
+			}
+
+			/* get node from db, remove db-entry, delete created node */
+			retval = udev_remove_device(&udev);
+		}
+
+		/* 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);
+
+			wait_for_devices_device(devices_dev, &error);
+
+			sysfs_close_device(devices_dev);
+		} else if (strcmp(action, "remove") == 0) {
+			dbg("devices remove");
+		}
+	} else {
+		dbg("unhandled");
 	}
-	udevdb_exit();
 
-exit:	
+hotplug:
+	if (udev_hotplug_d && manage_hotplug_event())
+		udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
+
+exit:
+	logging_close();
 	return retval;
 }