X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=d44f73081d2f7606a4a9220be0d782f601b17ce1;hp=5064bbd17512b0e6463a7fc147469b851cacc39c;hb=613ffbeb15e0507581e5037850c1ea5d56cd0928;hpb=f071348004c8069b610effd95309ff47c515cf3e

diff --git a/udev.c b/udev.c
index 5064bbd17..d44f73081 100644
--- a/udev.c
+++ b/udev.c
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * 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
@@ -20,43 +21,35 @@
  *
  */
 
-#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
+#include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
+#include "udev_rules.h"
 #include "logging.h"
-#include "namedev.h"
-#include "udevdb.h"
 
-/* timeout flag for udevdb */
-extern sig_atomic_t gotalarm;
-
-/* global variables */
-char **main_argv;
-char **main_envp;
-
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
-void log_message(int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
 {
 	va_list args;
 
-	if (!udev_log)
+	if (priority > udev_log_priority)
 		return;
 
 	va_start(args, format);
-	vsyslog(level, format, args);
+	vsyslog(priority, format, args);
 	va_end(args);
 }
 #endif
@@ -65,142 +58,168 @@ static void asmlinkage sig_handler(int signum)
 {
 	switch (signum) {
 		case SIGALRM:
-			gotalarm = 1;
-			info("error: timeout reached, event probably not handled correctly");
-			break;
+			exit(1);
 		case SIGINT:
 		case SIGTERM:
-			udevdb_exit();
 			exit(20 + signum);
-		default:
-			dbg("unhandled signal %d", signum);
 	}
 }
 
 int main(int argc, char *argv[], char *envp[])
 {
-	struct sigaction act;
-	struct sysfs_class_device *class_dev;
 	struct udevice udev;
-	char path[SYSFS_PATH_MAX];
+	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;
-	enum {
-		ADD,
-		REMOVE,
-		UDEVSTART,
-	} act_type;
-
-	dbg("version %s", UDEV_VERSION);
 
-	main_argv = argv;
-	main_envp = envp;
+	if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+		printf("%s\n", UDEV_VERSION);
+		exit(0);
+	}
 
 	logging_init("udev");
-
 	udev_init_config();
-
-	if (strstr(argv[0], "udevstart")) {
-		act_type = UDEVSTART;
-	} else {
-		const char *action = get_action();
-		const char *devpath = get_devpath();
-		const char *subsystem = get_subsystem(main_argv[1]);
-
-		if (!action) {
-			dbg("no action?");
-			goto exit;
-		}
-		if (strcmp(action, "add") == 0) {
-			act_type = ADD;
-		} else if (strcmp(action, "remove") == 0) {
-			act_type = REMOVE;
-		} else {
-			dbg("no action '%s' for us", action);
-			goto exit;
-		}
-
-		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;
-		}
-
-		if (!subsystem) {
-			dbg("no subsystem");
-			goto exit;
-		}
-
-		udev_set_values(&udev, devpath, subsystem);
-
-		/* skip blacklisted subsystems */
-		if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
-			dbg("don't care about '%s' devices", subsystem);
-			goto exit;
-		};
-
-	}
+	dbg("version %s", UDEV_VERSION);
 
 	/* set signal handlers */
-	act.sa_handler = (void (*) (int))sig_handler;
+	memset(&act, 0x00, sizeof(act));
+	act.sa_handler = (void (*)(int)) sig_handler;
 	sigemptyset (&act.sa_mask);
-	/* alarm must not restart syscalls*/
+	act.sa_flags = 0;
 	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	/* trigger timout to interrupt blocking syscalls */
-	alarm(ALARM_TIMEOUT);
-
-	/* initialize udev database */
-	if (udevdb_init(UDEVDB_DEFAULT) != 0)
-		info("error: unable to initialize database, continuing without database");
-
-	switch(act_type) {
-	case UDEVSTART:
-		dbg("udevstart");
-		namedev_init();
-		retval = udev_start();
-		break;
-	case ADD:
-		dbg("udev add");
-
-		/* open the device */
-		snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
-		class_dev = sysfs_open_class_device_path(path);
-		if (class_dev == NULL) {
-			dbg ("sysfs_open_class_device_path failed");
-			break;
-		}
-		dbg("opened class_dev->name='%s'", class_dev->name);
+	/* trigger timeout to prevent hanging processes */
+	alarm(UDEV_ALARM_TIMEOUT);
+
+	action = getenv("ACTION");
+	devpath = getenv("DEVPATH");
+	subsystem = getenv("SUBSYSTEM");
+	/* older kernels passed the SUBSYSTEM only as argument */
+	if (!subsystem && argc == 2)
+		subsystem = argv[1];
+
+	if (!action || !subsystem || !devpath) {
+		err("action, subsystem or devpath missing");
+		goto exit;
+	}
 
-		/* init rules */
-		namedev_init();
+	/* export log_priority , as called programs may want to do the same as udev */
+	if (udev_log_priority) {
+		char priority[32];
 
-		/* name, create node, store in db */
-		retval = udev_add_device(&udev, class_dev);
+		sprintf(priority, "%i", udev_log_priority);
+		setenv("UDEV_LOG", priority, 1);
+	}
+
+	udev_init_device(&udev, devpath, subsystem, action);
+	udev_rules_init(&rules, 0);
 
-		/* run scripts */
-		dev_d_execute(&udev);
+	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;
+			}
+			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");
+					goto cleanup;
+				}
+				if (udev.name[0] == '\0') {
+					info("device node creation supressed");
+					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, NULL);
+				if (udev.ignore_device) {
+					info("device event will be ignored");
+					goto cleanup;
+				}
+			}
+			sysfs_close_class_device(class_dev);
+		} else if (strcmp(action, "remove") == 0) {
+			dbg("node remove");
+			udev_rules_get_run(&rules, &udev, NULL);
+			if (udev.ignore_device) {
+				dbg("device event will be ignored");
+				goto cleanup;
+			}
+
+			/* get name from db, remove db-entry, delete node */
+			retval = udev_remove_device(&udev);
+		}
 
-		sysfs_close_class_device(class_dev);
-		break;
-	case REMOVE:
-		dbg("udev remove");
+		/* 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;
+		}
+		dbg("devices device opened '%s'", path);
+		wait_for_devices_device(devices_dev, &error);
+		udev_rules_get_run(&rules, &udev, devices_dev);
+		sysfs_close_device(devices_dev);
+		if (udev.ignore_device) {
+			info("device event will be ignored");
+			goto cleanup;
+		}
+	} else {
+		dbg("default handling");
+		udev_rules_get_run(&rules, &udev, NULL);
+		if (udev.ignore_device) {
+			info("device event will be ignored");
+			goto cleanup;
+		}
+	}
 
-		/* get node from db, delete it*/
-		retval = udev_remove_device(&udev);
+run:
+	if (udev_run && !list_empty(&udev.run_list)) {
+		struct name_entry *name_loop;
 
-		/* run scripts */
-		dev_d_execute(&udev);
+		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();
+cleanup:
+	udev_cleanup_device(&udev);
 
 exit:
 	logging_close();