X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=d736711a3f7d1b62009482bd0158025ceb37822a;hp=4bc094fd908f8c2f3dd21ea10f287f6de300f6a8;hb=ad27f5b3962d4cb1e4fcc25d3d0c7d0c81abc82a;hpb=e964c2c05d3d6e2bdb21b3461ed7a4e85315cbc1

diff --git a/udevtest.c b/udevtest.c
index 4bc094fd9..d736711a3 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -1,9 +1,7 @@
 /*
- * udev.c
+ * udevtest.c
  *
- * Userspace devfs
- *
- * Copyright (C) 2003,2004 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
@@ -23,30 +21,25 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <stddef.h>
+#include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <syslog.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_version.h"
-#include "logging.h"
-#include "namedev.h"
+#include "udev_rules.h"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
 
-#ifdef LOG
-unsigned char logname[42];
-void log_message (int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message (int priority, const char *format, ...)
 {
-	va_list	args;
+	va_list args;
 
-//	if (!udev_log)
-//		return;
+	if (priority > udev_log_priority)
+		return;
 
-	/* FIXME use level... */
 	va_start(args, format);
 	vprintf(format, args);
 	va_end(args);
@@ -55,89 +48,85 @@ void log_message (int level, const char *format, ...)
 }
 #endif
 
-static void sig_handler(int signum)
+int main(int argc, char *argv[], char *envp[])
 {
-	switch (signum) {
-		case SIGINT:
-		case SIGTERM:
-			exit(20 + signum);
-		default:
-			dbg("unhandled signal");
-	}
-}
+	struct udev_rules rules;
+	char *devpath;
+	char temp[PATH_SIZE];
+	struct udevice *udev;
+	struct sysfs_device *dev;
+	int retval;
+	int rc = 0;
 
-static char *subsystem_blacklist[] = {
-	"net",
-	"scsi_host",
-	"scsi_device",
-	"usb_host",
-	"pci_bus",
-	"",
-};
+	info("version %s", UDEV_VERSION);
 
-static int udev_hotplug(int argc, char **argv)
-{
-	char *devpath;
-	char *subsystem;
-	int retval = -EINVAL;
-	int i;
-	struct sigaction act;
-
-	devpath = argv[1];
-	if (!devpath) {
-		dbg("no devpath?");
-		goto exit;
+	/* initialize our configuration */
+	udev_config_init();
+	if (udev_log_priority < LOG_INFO)
+		udev_log_priority = LOG_INFO;
+
+	if (argc != 2) {
+		info("Usage: udevtest <devpath>");
+		return 1;
 	}
-	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");
+	/* remove sysfs_path if given */
+	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
+		devpath = &argv[1][strlen(sysfs_path)];
+	else
+		if (argv[1][0] != '/') {
+			/* prepend '/' if missing */
+			snprintf(temp, sizeof(temp), "/%s", argv[1]);
+			temp[sizeof(temp)-1] = '\0';
+			devpath = temp;
+		} else
+			devpath = argv[1];
+
+	sysfs_init();
+	udev_rules_init(&rules, 0);
+
+	dev = sysfs_device_get(devpath);
+	if (dev == NULL) {
+		info("unable to open '%s'", devpath);
+		rc = 2;
 		goto exit;
 	}
 
-	/* skip blacklisted subsystems */
-	subsystem = argv[1];
-	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;
-		}
-		i++;
+	udev = udev_device_init();
+	if (udev == NULL) {
+		info("can't open device");
+		rc = 3;
+		goto exit;
 	}
 
-	/* initialize our configuration */
-	udev_init_config();
-
-	/* set up a default signal handler for now */
-	act.sa_handler = sig_handler;
-	sigemptyset (&act.sa_mask);
-	act.sa_flags = SA_RESTART;
-	sigaction(SIGINT, &act, NULL);
-	sigaction(SIGTERM, &act, NULL);
-
-	/* initialize the naming deamon */
-	namedev_init();
+	/* override built-in sysfs device */
+	udev->dev = dev;
+	strcpy(udev->action, "add");
+	udev->devt = udev_device_get_devt(udev);
 
-	retval = udev_add_device(devpath, subsystem, 1);
+	/* simulate node creation with test flag */
+	udev->test_run = 1;
 
-exit:
-	if (retval > 0)
-		retval = 0;
+	setenv("DEVPATH", udev->dev->devpath, 1);
+	setenv("SUBSYSTEM", udev->dev->subsystem, 1);
+	setenv("ACTION", "add", 1);
 
-	return -retval;
-}
+	info("looking at device '%s' from subsystem '%s'", udev->dev->devpath, udev->dev->subsystem);
+	retval = udev_device_event(&rules, udev);
+	if (retval == 0 && !udev->ignore_device && udev_run) {
+		struct name_entry *name_loop;
 
-int main(int argc, char **argv, char **envp)
-{
-	main_argv = argv;
-	main_envp = envp;
+		list_for_each_entry(name_loop, &udev->run_list, node) {
+			char program[PATH_SIZE];
 
-	dbg("version %s", UDEV_VERSION);
+			strlcpy(program, name_loop->name, sizeof(program));
+			udev_rules_apply_format(udev, program, sizeof(program));
+			info("run: '%s'", program);
+		}
+	}
 
-	return udev_hotplug(argc, argv);
+exit:
+	udev_rules_cleanup(&rules);
+	sysfs_cleanup();
+	return rc;
 }
-
-