X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=6e0f7f1d0c535389c0ff56b1c2cbdc35213f1667;hp=84950c82a344150fede11268186572ead021231f;hb=761e5b476f8e69f41958a62ed787f5d886fa212e;hpb=ee1db00d07ed1db55061ba5e2cb54800cc3e2495

diff --git a/udev.c b/udev.c
index 84950c82a..6e0f7f1d0 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,334 +21,209 @@
  *
  */
 
+#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_libc_wrapper.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 "udev_rules.h"
+#include "logging.h"
+
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
+{
+	va_list args;
 
-/* global variables */
-char **main_argv;
-char **main_envp;
+	if (priority > udev_log_priority)
+		return;
 
-static void sig_handler(int signum)
+	va_start(args, format);
+	vsyslog(priority, format, args);
+	va_end(args);
+}
+#endif
+
+static void asmlinkage sig_handler(int signum)
 {
-	dbg("caught signal %d", signum);
 	switch (signum) {
+		case SIGALRM:
+			exit(1);
 		case SIGINT:
 		case SIGTERM:
-		case SIGKILL:
-			sysbus_disconnect();
-			udevdb_exit();
 			exit(20 + signum);
-			break;
-		default:
-			dbg("unhandled signal");
 	}
 }
 
-static inline char *get_action(void)
-{
-	char *action;
-
-	action = getenv("ACTION");
-	return action;
-}
-
-static inline char *get_devpath(void)
-{
-	char *devpath;
-
-	devpath = getenv("DEVPATH");
-	return devpath;
-}
-
-static inline char *get_seqnum(void)
+int main(int argc, char *argv[], char *envp[])
 {
-	char *seqnum;
-
-	seqnum = getenv("SEQNUM");
-	return seqnum;
-}
+	struct udevice udev;
+	struct udev_rules rules;
+	char path[PATH_SIZE];
+	const char *error;
+	const char *action;
+	const char *devpath;
+	const char *subsystem;
+	struct sigaction act;
+	int retval = -EINVAL;
 
-static void print_record(char *path, struct udevice *dev)
-{
-	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");
-}
+	if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+		printf("%s\n", UDEV_VERSION);
+		exit(0);
+	}
 
-enum query_type {
-	NONE,
-	NAME,
-	SYMLINK,
-	OWNER,
-	GROUP
-};
+	logging_init("udev");
+	udev_init_config();
+	dbg("version %s", UDEV_VERSION);
 
-static inline int udev_user(int argc, char **argv)
-{
-	static const char short_options[] = "dp:q:rVh";
-	int option;
-	int retval = -EINVAL;
-	struct udevice dev;
-	int root = 0;
-	enum query_type query = NONE;
-	char result[NAME_SIZE] = "";
-	char path[NAME_SIZE] = "";
+	/* set signal handlers */
+	memset(&act, 0x00, sizeof(act));
+	act.sa_handler = (void (*)(int)) sig_handler;
+	sigemptyset (&act.sa_mask);
+	act.sa_flags = 0;
+	sigaction(SIGALRM, &act, NULL);
+	sigaction(SIGINT, &act, NULL);
+	sigaction(SIGTERM, &act, NULL);
 
-	/* get command line options */
-	while (1) {
-		option = getopt(argc, argv, short_options);
-		if (option == -1)
-			break;
+	/* trigger timeout to prevent hanging processes */
+	alarm(UDEV_ALARM_TIMEOUT);
 
-		dbg("option '%c'", option);
-		switch (option) {
-		case 'p':
-			dbg("udev path: %s\n", optarg);
-			strfieldcpy(path, optarg);
-			break;
+	action = getenv("ACTION");
+	devpath = getenv("DEVPATH");
+	subsystem = getenv("SUBSYSTEM");
+	/* older kernels passed the SUBSYSTEM only as argument */
+	if (!subsystem && argc == 2)
+		subsystem = argv[1];
 
-		case 'q':
-			dbg("udev query: %s\n", optarg);
+	if (!action || !subsystem || !devpath) {
+		err("action, subsystem or devpath missing");
+		goto exit;
+	}
 
-			if (strcmp(optarg, "name") == 0) {
-				query = NAME;
-				break;
-			}
+	/* export log_priority , as called programs may want to do the same as udev */
+	if (udev_log_priority) {
+		char priority[32];
 
-			if (strcmp(optarg, "symlink") == 0) {
-				query = SYMLINK;
-				break;
-			}
+		sprintf(priority, "%i", udev_log_priority);
+		setenv("UDEV_LOG", priority, 1);
+	}
 
-			if (strcmp(optarg, "owner") == 0) {
-				query = OWNER;
-				break;
+	udev_init_device(&udev, devpath, subsystem, action);
+	udev_rules_init(&rules, 0);
+
+	if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
+		/* handle device node */
+		if (strcmp(action, "add") == 0) {
+			struct sysfs_class_device *class_dev;
+
+			/* wait for sysfs of /sys/class /sys/block */
+			dbg("node add");
+			snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
+			path[sizeof(path)-1] = '\0';
+			class_dev = wait_class_device_open(path);
+			if (class_dev == NULL) {
+				dbg("open class device failed");
+				goto run;
 			}
-
-			if (strcmp(optarg, "group") == 0) {
-				query = GROUP;
-				break;
+			dbg("opened class_dev->name='%s'", class_dev->name);
+			wait_for_class_device(class_dev, &error);
+
+			/* get major/minor */
+			if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS)
+				udev.devt = get_devt(class_dev);
+
+			if (udev.type == DEV_NET || udev.devt) {
+				/* name device */
+				udev_rules_get_name(&rules, &udev, class_dev);
+				if (udev.ignore_device) {
+					info("device event will be ignored");
+					sysfs_close_class_device(class_dev);
+					goto cleanup;
+				}
+				if (udev.name[0] == '\0') {
+					info("device node creation supressed");
+					sysfs_close_class_device(class_dev);
+					goto cleanup;
+				}
+				/* create node, store in db */
+				retval = udev_add_device(&udev, class_dev);
+			} else {
+				dbg("no dev-file found");
+				udev_rules_get_run(&rules, &udev, class_dev, NULL);
+				if (udev.ignore_device) {
+					info("device event will be ignored");
+					sysfs_close_class_device(class_dev);
+					goto cleanup;
+				}
 			}
-
-			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;
+			sysfs_close_class_device(class_dev);
+		} else if (strcmp(action, "remove") == 0) {
+			dbg("node remove");
+			udev_rules_get_run(&rules, &udev, NULL, NULL);
+			if (udev.ignore_device) {
+				dbg("device event will be ignored");
+				goto cleanup;
 			}
-			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;
+			/* get name from db, remove db-entry, delete node */
+			retval = udev_remove_device(&udev);
 		}
-	}
 
-	/* process options */
-	if (query != NONE) {
-		if (path[0] == '\0') {
-			printf("query needs device path specified\n");
-			return -EINVAL;
+		/* export name of device node or netif */
+		if (udev.devname[0] != '\0')
+			setenv("DEVNAME", udev.devname, 1);
+	} else if (udev.type == DEV_DEVICE && strcmp(action, "add") == 0) {
+		struct sysfs_device *devices_dev;
+
+		/* wait for sysfs of /sys/devices/ */
+		dbg("devices add");
+		snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath);
+		path[sizeof(path)-1] = '\0';
+		devices_dev = wait_devices_device_open(path);
+		if (!devices_dev) {
+			dbg("devices device unavailable (probably remove has beaten us)");
+			goto run;
 		}
-
-		retval = udevdb_open_ro();
-		if (retval != 0) {
-			printf("unable to open udev database\n");
-			return -EACCES;
+		dbg("devices device opened '%s'", path);
+		wait_for_devices_device(devices_dev, &error);
+		udev_rules_get_run(&rules, &udev, NULL, devices_dev);
+		sysfs_close_device(devices_dev);
+		if (udev.ignore_device) {
+			info("device event will be ignored");
+			goto cleanup;
 		}
-		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;
-	}
-
-	if (root) {
-		printf("%s\n", udev_root);
-		return 0;
-	}
-
-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;
-}
-
-static char *subsystem_blacklist[] = {
-	"net",
-	"scsi_host",
-	"scsi_device",
-	"",
-};
-
-static inline int udev_hotplug(int argc, char **argv)
-{
-	char *action;
-	char *devpath;
-	char *subsystem;
-	int retval = -EINVAL;
-	int i;
-
-	subsystem = argv[1];
-
-	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 */
-	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;
+	} else {
+		dbg("default handling");
+		udev_rules_get_run(&rules, &udev, NULL, NULL);
+		if (udev.ignore_device) {
+			info("device event will be ignored");
+			goto cleanup;
 		}
-		i++;
 	}
 
-	action = get_action();
-	if (!action) {
-		dbg ("no action?");
-		goto exit;
-	}
-
-	/* 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;
-	}
-
-	/* set up a default signal handler for now */
-	signal(SIGINT, sig_handler);
-	signal(SIGTERM, sig_handler);
-	signal(SIGKILL, sig_handler);
+run:
+	if (udev_run && !list_empty(&udev.run_list)) {
+		struct name_entry *name_loop;
 
-	/* 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);
-
-	else {
-		dbg("unknown action '%s'", action);
-		retval = -EINVAL;
+		dbg("executing run list");
+		list_for_each_entry(name_loop, &udev.run_list, node)
+			execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
 	}
-	udevdb_exit();
 
-exit_sysbus:
-	/* disconnect from the system message bus */
-	sysbus_disconnect();
+cleanup:
+	udev_cleanup_device(&udev);
 
 exit:
-	if (retval > 0)
-		retval = 0;
-
-	return -retval;
-}
-
-int main(int argc, char **argv, char **envp)
-{
-	int retval;
-	main_argv = argv;
-	main_envp = envp;
-
-	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);
-	}
-
+	logging_close();
 	return retval;
 }
-
-