X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=926c4b526ab5a82dd0107af833f5cfaf8569e98b;hb=f336ff8003a547f162bfc27ad6fe6417a9035fed;hp=de6b6565f249c8cefd71490e8b4c5446e5fa86bc;hpb=af815f882dc196b1357f5be81cb00c8fe9c60670;p=elogind.git

diff --git a/udev.c b/udev.c
index de6b6565f..926c4b526 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,283 +19,139 @@
  *
  */
 
+#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 <syslog.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_rules.h"
+#include "logging.h"
 
-
-static char *get_action(void)
-{
-	char *action;
-
-	action = getenv("ACTION");
-	return action;
-}
-
-
-static char *get_device(void)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
 {
-	static char device[255];
-	char *temp;
+	va_list args;
 
-	temp = getenv("DEVPATH");
-	if (temp == NULL)
-		return NULL;
-	strcpy(device, SYSFS_ROOT);
-	strcat(device, temp);
+	if (priority > udev_log_priority)
+		return;
 
-	return device;
+	va_start(args, format);
+	vsyslog(priority, format, args);
+	va_end(args);
 }
+#endif
 
-/* 
- * Right now the major/minor of a device is stored in a file called
- * "dev" in sysfs.
- * The number is stored as:
- * 	MMmm
- * 		MM is the major
- * 		mm is the minor
- * 		The value is in hex.
- * Yes, this will probably change when we go to a bigger major/minor
- * range, and will have to be changed at that time.
- */
-static int get_major_minor (char *dev, int *major, int *minor)
+static void asmlinkage sig_handler(int signum)
 {
-	char filename[255];
-	char line[20];
-	char temp[3];
-	int fd;
-	int retval = 0;
-
-	/* add the dev file to the directory and see if it's present */
-	strncpy(filename, dev, sizeof(filename));
-	strncat(filename, DEV_FILE, sizeof(filename));
-	fd = open(filename, O_RDONLY);
-	if (fd < 0) {
-		dbg("Can't open %s", filename);
-		return -ENODEV;
+	switch (signum) {
+		case SIGALRM:
+			exit(1);
+		case SIGINT:
+		case SIGTERM:
+			exit(20 + signum);
 	}
-
-	/* get the major/minor */
-	retval = read(fd, line, sizeof(line));
-	if (retval < 0) {
-		dbg("read error on %s", dev);
-		goto exit;
-	}
-
-	temp[0] = line[0];
-	temp[1] = line[1];
-	temp[2] = 0x00;
-	*major = (int)strtol(&temp[0], NULL, 16);
-
-	temp[0] = line[2];
-	temp[1] = line[3];
-	temp[2] = 0x00;
-	*minor = (int)strtol(&temp[0], NULL, 16);
-
-	dbg("found major = %d, minor = %d", *major, *minor);
-
-	retval = 0;
-exit:
-	close(fd);
-	return retval;
 }
 
-/*
- * Here would go a call to the naming deamon, to get the name we want to have
- * for this device.  But for now, let's just default to whatever the kernel is
- * calling the device as that will keep the "old-style" naming policy
- */
-static char *get_name(char *dev, int major, int minor)
-{
-	static char name[100];
-	char *temp;
-
-	temp = strrchr(dev, '/');
-	if (temp == NULL)
-		return NULL;
-	strncpy(name, &temp[1], sizeof(name));
-
-	dbg("name is %s", name);
-
-	return &name[0];
-}
-
-/*
- * Again, this will live in the naming deamon
- */
-static int get_mode(char *name, char *dev, int major, int minor)
-{
-	/* just default everyone to rw for the world! */
-	return 0666;
-}
-
-/*
- * We also want to add some permissions here, and possibly some symlinks
- */
-static int create_node(char *name, char type, int major, int minor, int mode)
+int main(int argc, char *argv[], char *envp[])
 {
-	char *argv[7];
-	char mode_string[100];
-	char type_string[3];
-	char major_string[20];
-	char minor_string[20];
-	char filename[255];
-	int retval = 0;
-
-	strncpy(filename, UDEV_ROOT, sizeof(filename));
-	strncat(filename, name, sizeof(filename));
-
-	snprintf(mode_string, sizeof(mode_string), "--mode=%#o", mode);
-	snprintf(type_string, sizeof(type_string), "%c", type);
-	snprintf(major_string, sizeof(major_string), "%d", major);
-	snprintf(minor_string, sizeof(minor_string), "%d", minor);
-	
-	argv[0] = MKNOD;
-	argv[1] = mode_string;
-	argv[2] = filename;
-	argv[3] = type_string;
-	argv[4] = major_string;
-	argv[5] = minor_string;
-	argv[6] = NULL;
-	dbg ("executing %s %s %s %s %s %s",
-		argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
-	switch (fork()) {
-		case 0:
-			/* we are the child, so lets run the program */
-			execv (MKNOD, argv);
-			exit(0);
-			break;
-		case (-1):
-			dbg ("fork failed.");
-			retval = -EFAULT;
-			break;
-		default:
-			break;
-	}
-	return retval;
-}
-
-/*
- * We also want to clean up any symlinks that were created in create_node()
- */
-static int delete_node(char *name)
-{
-	char filename[255];
-
-	strncpy(filename, UDEV_ROOT, sizeof(filename));
-	strncat(filename, name, sizeof(filename));
-
-	dbg("unlinking %s", filename);
-	return unlink(filename);
-}
-
-static int add_device(char *device, char type)
-{
-	char *name;
-	int major;
-	int minor;
-	int mode;
+	struct udevice udev;
+	struct udev_rules rules;
+	const char *action;
+	const char *devpath;
+	const char *subsystem;
+	struct sigaction act;
+	int devnull;
 	int retval = -EINVAL;
 
-	retval = get_major_minor(device, &major, &minor);
-	if (retval) {
-		dbg ("get_major_minor failed");
-		goto exit;
+	if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+		printf("%s\n", UDEV_VERSION);
+		exit(0);
 	}
 
-	name = get_name(device, major, minor);
-	if (name == NULL) {
-		dbg ("get_name failed");
-		retval = -ENODEV;
-		goto exit;
-	}
-
-	mode = get_mode(name, device, major, minor);
-	if (mode < 0) {
-		dbg ("get_mode failed");
-		retval = -EINVAL;
-		goto exit;
+	/* set std fd's to /dev/null, if the kernel forks us, we don't have them at all */
+	devnull = open("/dev/null", O_RDWR);
+	if (devnull >= 0)  {
+		if (devnull != STDIN_FILENO)
+			dup2(devnull, STDIN_FILENO);
+		if (devnull != STDOUT_FILENO)
+			dup2(devnull, STDOUT_FILENO);
+		if (devnull != STDERR_FILENO)
+			dup2(devnull, STDERR_FILENO);
+		if (devnull > STDERR_FILENO)
+			close(devnull);
 	}
 
-	return create_node(name, type, major, minor, mode);
+	logging_init("udev");
+	if (devnull < 0)
+		err("fatal, could not open /dev/null");
+	udev_init_config();
+	dbg("version %s", UDEV_VERSION);
 
-exit:
-	return retval;
-}
+	/* 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);
 
-static int remove_device(char *device)
-{
-	char *name;
-	int retval = 0;
+	/* trigger timeout to prevent hanging processes */
+	alarm(UDEV_ALARM_TIMEOUT);
 
-	name = get_name(device, 0, 0);
-	if (name == NULL) {
-		dbg ("get_name failed");
-		retval = -ENODEV;
+	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;
 	}
 
-	return delete_node(name);
+	/* export log_priority , as called programs may want to do the same as udev */
+	if (udev_log_priority) {
+		char priority[32];
 
-exit:
-	return retval;
-}
-
-int main(int argc, char *argv[])
-{
-	char *subsystem;
-	char *action;
-	char *device;
-	char type;
-	int retval = -EINVAL;
-	
-	if (argc != 2) {
-		dbg ("unknown number of arguments");
-		goto exit;
+		sprintf(priority, "%i", udev_log_priority);
+		setenv("UDEV_LOG", priority, 1);
 	}
 
-	/* sleep for a second or two to give the kernel a chance to
-	 * create the dev file
-	 */
-	sleep(2);
+	udev_init_device(&udev, devpath, subsystem, action);
+	udev_rules_init(&rules, 1, 0);
 
-	/* for now, the block layer is the only place where block devices are */
-	subsystem = argv[1];
-	if (strcmp(subsystem, "block") == 0)
-		type = 'b';
-	else
-		type = 'c';
+	retval = udev_process_event(&rules, &udev);
 
-	action = get_action();
-	if (!action) {
-		dbg ("no action?");
-		goto exit;
-	}
+	if (!retval && udev_run && !list_empty(&udev.run_list)) {
+		struct name_entry *name_loop;
 
-	device = get_device();
-	if (!device) {
-		dbg ("no device?");
-		goto exit;
+		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
+				run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+		}
 	}
-	dbg("looking at %s", device);
 
-	if (strcmp(action, "add") == 0)
-		return add_device(device, type);
+	udev_rules_close(&rules);
+	udev_cleanup_device(&udev);
 
-	if (strcmp(action, "remove") == 0)
-		return remove_device(device);
-
-	dbg("Unknown action: %s", action);
-	return -EINVAL;
-
-	retval = 0;
-exit:	
+exit:
+	logging_close();
 	return retval;
 }
-