X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=006d55510e3aa1b84e6e189b5d0b9ec343361502;hp=175f14326977256d37b053d9ee3190e3ff8c82fb;hb=e5e322bc627a07d29a07e08f7c96bd644a3ae057;hpb=0bad3406c1e8eba6d5af2cbfd44d8a61231fa2bb

diff --git a/udevtest.c b/udevtest.c
index 175f14326..006d55510 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -1,5 +1,5 @@
 /*
- * udev.c
+ * udevtest.c
  *
  * Userspace devfs
  *
@@ -26,27 +26,21 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
-#include <sysfs/libsysfs.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_sysfs.h"
+#include "udev_utils.h"
 #include "udev_version.h"
+#include "udev_rules.h"
 #include "logging.h"
-#include "namedev.h"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
 
-#ifdef LOG
-unsigned char logname[42];
+#ifdef USE_LOG
 void log_message (int level, const char *format, ...)
 {
-	va_list	args;
+	va_list args;
 
-//	if (!udev_log)
-//		return;
-
-	/* FIXME use level... */
 	va_start(args, format);
 	vprintf(format, args);
 	va_end(args);
@@ -55,113 +49,70 @@ void log_message (int level, const char *format, ...)
 }
 #endif
 
-static void sig_handler(int signum)
-{
-	switch (signum) {
-		case SIGINT:
-		case SIGTERM:
-			exit(20 + signum);
-		default:
-			dbg("unhandled signal");
-	}
-}
-
-static inline char *get_action(void)
-{
-	char *action;
-
-	action = getenv("ACTION");
-	return action;
-}
-
-static inline char *get_devpath(void)
-{
-	char *devpath;
-
-	devpath = getenv("DEVPATH");
-	return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-	char *seqnum;
-
-	seqnum = getenv("SEQNUM");
-	return seqnum;
-}
-
-static char *subsystem_blacklist[] = {
-	"net",
-	"scsi_host",
-	"scsi_device",
-	"usb_host",
-	"pci_bus",
-	"",
-};
-
-static int udev_hotplug(int argc, char **argv)
+int main(int argc, char *argv[], char *envp[])
 {
+	struct sysfs_class_device *class_dev;
 	char *devpath;
-	char *subsystem;
-	int retval = -EINVAL;
-	int i;
-	struct sigaction act;
-
-	devpath = argv[1];
-	if (!devpath) {
-		dbg("no devpath?");
-		goto exit;
-	}
-	dbg("looking at '%s'", devpath);
+	char path[PATH_SIZE];
+	char temp[PATH_SIZE];
+	struct udevice udev;
+	char *subsystem = NULL;
 
-	/* 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;
-	}
+	info("version %s", UDEV_VERSION);
 
-	/* 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++;
+	if (argc < 2 || argc > 3) {
+		info("Usage: udevtest <devpath> [subsystem]");
+		return 1;
 	}
 
 	/* 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);
+	/* 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];
+
+	info("looking at '%s'", devpath);
 
 	/* initialize the naming deamon */
-	namedev_init();
+	udev_rules_init();
 
-	retval = udev_add_device(devpath, subsystem, 1);
+	if (argc == 3)
+		subsystem = argv[2];
 
-exit:
-	if (retval > 0)
-		retval = 0;
+	/* fill in values and test_run flag*/
+	udev_init_device(&udev, devpath, subsystem);
 
-	return -retval;
-}
+	/* skip subsystems without "dev", but handle net devices */
+	if (udev.type != DEV_NET && subsystem_expect_no_dev(udev.subsystem)) {
+		info("don't care about '%s' devices", udev.subsystem);
+		return 2;
+	}
 
-int main(int argc, char **argv, char **envp)
-{
-	main_argv = argv;
-	main_envp = envp;
+	/* open the device */
+	snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
+	path[sizeof(path)-1] = '\0';
+	class_dev = sysfs_open_class_device_path(path);
+	if (class_dev == NULL) {
+		info("sysfs_open_class_device_path failed");
+		return 1;
+	}
 
-	dbg("version %s", UDEV_VERSION);
+	info("opened class_dev->name='%s'", class_dev->name);
 
-	return udev_hotplug(argc, argv);
-}
+	/* simulate node creation with test flag */
+	udev.test_run = 1;
+	udev_add_device(&udev, class_dev);
 
+	sysfs_close_class_device(class_dev);
 
+	return 0;
+}