X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=ecfd5644ec5f28ba87c970fe23c823eeb1197ff6;hb=34c00c915c6dd9d063551732169cb3c3126376ad;hp=a3984771188a50d33a3e6b02fcf38922868ea8df;hpb=2e5a8b99f89f30ee06b39da7dee024a7361b9886;p=elogind.git

diff --git a/udev.c b/udev.c
index a39847711..ecfd5644e 100644
--- a/udev.c
+++ b/udev.c
@@ -1,10 +1,8 @@
 /*
  * udev.c
  *
- * Userspace devfs
- *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004-2005 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,108 +19,122 @@
  *
  */
 
+#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_libc_wrapper.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"
-
+#include "udev_rules.h"
+#include "logging.h"
 
-static char *get_action(void)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
 {
-	char *action;
+	va_list args;
 
-	action = getenv("ACTION");
-	return action;
-}
+	if (priority > udev_log_priority)
+		return;
 
+	va_start(args, format);
+	vsyslog(priority, format, args);
+	va_end(args);
+}
+#endif
 
-static char *get_device(void)
+static void asmlinkage sig_handler(int signum)
 {
-	char *device;
-
-	device = getenv("DEVPATH");
-	return device;
+	switch (signum) {
+		case SIGALRM:
+			exit(1);
+		case SIGINT:
+		case SIGTERM:
+			exit(20 + signum);
+	}
 }
 
-char **main_argv;
-char **main_envp;
-
-int main(int argc, char **argv, char **envp)
+int main(int argc, char *argv[], char *envp[])
 {
-	char *action;
-	char *device;
-	char *subsystem;
+	struct udevice udev;
+	struct udev_rules rules;
+	const char *action;
+	const char *devpath;
+	const char *subsystem;
+	struct sigaction act;
 	int retval = -EINVAL;
-	
-	main_argv = argv;
-	main_envp = envp;
 
-	dbg("version %s", UDEV_VERSION);
-
-	if (argc != 2) {
-		dbg ("unknown number of arguments");
-		goto exit;
+	if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+		printf("%s\n", UDEV_VERSION);
+		exit(0);
 	}
 
-	subsystem = argv[1];
+	logging_init("udev");
+	udev_init_config();
+	dbg("version %s", UDEV_VERSION);
 
-	device = get_device();
-	if (!device) {
-		dbg ("no device?");
-		goto exit;
-	}
-	dbg("looking at %s", device);
+	/* 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);
 
-	/* we only care about class devices and block stuff */
-	if (!strstr(device, "class") &&
-	    !strstr(device, "block")) {
-		dbg("not block or class");
-		goto exit;
-	}
+	/* trigger timeout to prevent hanging processes */
+	alarm(UDEV_ALARM_TIMEOUT);
 
-	/* but we don't care about net class devices */
-	if (strcmp(subsystem, "net") == 0) {
-		dbg("don't care about net devices");
+	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;
 	}
 
-	action = get_action();
-	if (!action) {
-		dbg ("no action?");
-		goto exit;
-	}
+	/* export log_priority , as called programs may want to do the same as udev */
+	if (udev_log_priority) {
+		char priority[32];
 
-	/* initialize udev database */
-	retval = udevdb_init(UDEVDB_DEFAULT);
-	if (retval != 0) {
-		dbg("Unable to initialize database.");
-		goto exit;
+		sprintf(priority, "%i", udev_log_priority);
+		setenv("UDEV_LOG", priority, 1);
 	}
 
-	/* initialize the naming deamon */
-	namedev_init();
+	udev_init_device(&udev, devpath, subsystem, action);
+	udev_rules_init(&rules, 1, 0);
 
-	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(device, argv[1]);
+	retval = udev_process_event(&rules, &udev);
 
-	else if (strcmp(action, "remove") == 0)
-		retval = udev_remove_device(device, argv[1]);
+	if (!retval && udev_run && !list_empty(&udev.run_list)) {
+		struct name_entry *name_loop;
 
-	else {
-		dbg("Unknown action: %s", action);
-		retval = -EINVAL;
+		dbg("executing run list");
+		list_for_each_entry(name_loop, &udev.run_list, node) {
+			if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
+				pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, action);
+			else
+				execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
+		}
 	}
-	udevdb_exit();
 
-exit:	
+	udev_rules_close(&rules);
+	udev_cleanup_device(&udev);
+
+exit:
+	logging_close();
 	return retval;
 }
-