X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=a41f22277880be604ab4beef193847373110bbd0;hb=d4a32aa2e4804de9189574213749616dda57faa7;hp=6e7ac25175b8dc9450b9426cda9a266f538c2288;hpb=dbfc520c605dee3244dbbfd563e908901324689b;p=elogind.git

diff --git a/udev.c b/udev.c
index 6e7ac2517..a41f22277 100644
--- a/udev.c
+++ b/udev.c
@@ -3,8 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *	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,100 +20,169 @@
  *
  */
 
+#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_lib.h"
+#include "udev_sysfs.h"
 #include "udev_version.h"
 #include "namedev.h"
-#include "udevdb.h"
-#include "libsysfs/libsysfs.h"
+#include "logging.h"
 
 
-static char *get_action(void)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
 {
-	char *action;
+	va_list args;
 
-	action = getenv("ACTION");
-	return action;
-}
+	if (!udev_log)
+		return;
 
+	va_start(args, format);
+	vsyslog(level, 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);
+	}
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[], char *envp[])
 {
-	char *action;
-	char *device;
-	char *subsystem;
+	struct sigaction act;
+	struct sysfs_class_device *class_dev;
+	struct udevice udev;
+	char path[SYSFS_PATH_MAX];
 	int retval = -EINVAL;
-	
-	if (argc != 2) {
-		dbg ("unknown number of arguments");
-		goto exit;
-	}
-
-	subsystem = argv[1];
+	enum {
+		ADD,
+		REMOVE,
+		UDEVSTART,
+	} act_type;
+
+	dbg("version %s", UDEV_VERSION);
+	logging_init("udev");
+	udev_init_config();
+
+	if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
+		act_type = UDEVSTART;
+	} else {
+		const char *action = getenv("ACTION");
+		const char *devpath = getenv("DEVPATH");
+		const char *subsystem = 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, action);
+
+		/* skip blacklisted subsystems */
+		if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
+			dbg("don't care about '%s' devices", subsystem);
+			goto exit;
+		};
 
-	device = get_device();
-	if (!device) {
-		dbg ("no device?");
-		goto exit;
 	}
-	dbg("looking at %s", device);
 
-	/* we only care about class devices and block stuff */
-	if (!strstr(device, "class") &&
-	    !strstr(device, "block")) {
-		dbg("not block or class");
-		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);
+
+	/* trigger timout to interrupt blocking syscalls */
+	alarm(ALARM_TIMEOUT);
+
+	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);
+
+		/* init rules */
+		namedev_init();
+
+		/* name, create node, store in db */
+		retval = udev_add_device(&udev, class_dev);
+
+		/* run dev.d/ scripts if we created a node or changed a netif name */
+		if (udev.devname[0] != '\0') {
+			setenv("DEVNAME", udev.devname, 1);
+			dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+		}
+
+		sysfs_close_class_device(class_dev);
+		break;
+	case REMOVE:
+		dbg("udev remove");
+
+		/* get node from db, delete it*/
+		retval = udev_remove_device(&udev);
+
+		/* run scripts */
+		dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
 	}
 
-	/* but we don't care about net class devices */
-	if (strcmp(subsystem, "net") == 0) {
-		dbg("don't care about net devices");
-		goto exit;
-	}
-
-	action = get_action();
-	if (!action) {
-		dbg ("no action?");
-		goto exit;
-	}
-
-	/* initialize udev database */
-	retval = udevdb_init(UDEVDB_DEFAULT);
-	if (retval != 0) {
-		dbg("Unable to initialize database.");
-		goto exit;
-	}
-
-	/* initialize the naming deamon */
-	namedev_init();
-
-	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(device, argv[1]);
-
-	else if (strcmp(action, "remove") == 0)
-		retval = udev_remove_device(device, argv[1]);
-
-	else {
-		dbg("Unknown action: %s", action);
-		retval = -EINVAL;
-	}
-	udevdb_exit();
-
-exit:	
+exit:
+	logging_close();
 	return retval;
 }
-