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

diff --git a/udevtest.c b/udevtest.c
index f24c7e4ba..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,28 +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_lib.h"
-#include "udev_version.h"
-#include "logging.h"
-#include "namedev.h"
-
-/* global variables */
-char **main_argv;
-char **main_envp;
+#include "udev_rules.h"
 
 
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
-void log_message (int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message (int priority, const char *format, ...)
 {
 	va_list args;
 
+	if (priority > udev_log_priority)
+		return;
+
 	va_start(args, format);
 	vprintf(format, args);
 	va_end(args);
@@ -55,55 +50,83 @@ void log_message (int level, const char *format, ...)
 
 int main(int argc, char *argv[], char *envp[])
 {
+	struct udev_rules rules;
 	char *devpath;
-	char temp[NAME_SIZE];
-	char *subsystem = "";
-	const int fake = 1;
-
-	main_argv = argv;
-	main_envp = envp;
+	char temp[PATH_SIZE];
+	struct udevice *udev;
+	struct sysfs_device *dev;
+	int retval;
+	int rc = 0;
 
 	info("version %s", UDEV_VERSION);
 
-	if (argv[1] == NULL) {
-		info("udevinfo expects the DEVPATH of the sysfs device as a argument");
-		goto exit;
-	}
-
 	/* initialize our configuration */
-	udev_init_config();
+	udev_config_init();
+	if (udev_log_priority < LOG_INFO)
+		udev_log_priority = LOG_INFO;
+
+	if (argc != 2) {
+		info("Usage: udevtest <devpath>");
+		return 1;
+	}
 
 	/* remove sysfs_path if given */
 	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
-		devpath = argv[1] + strlen(sysfs_path);
+		devpath = &argv[1][strlen(sysfs_path)];
 	else
 		if (argv[1][0] != '/') {
 			/* prepend '/' if missing */
-			strfieldcpy(temp, "/");
-			strfieldcat(temp, argv[1]);
+			snprintf(temp, sizeof(temp), "/%s", argv[1]);
+			temp[sizeof(temp)-1] = '\0';
 			devpath = temp;
-		} else {
+		} else
 			devpath = argv[1];
-		}
 
-	info("looking at '%s'", devpath);
+	sysfs_init();
+	udev_rules_init(&rules, 0);
 
-	/* we only care about class devices and block stuff */
-	if (!strstr(devpath, "class") &&
-	    !strstr(devpath, "block")) {
-		info("not a block or class device");
+	dev = sysfs_device_get(devpath);
+	if (dev == NULL) {
+		info("unable to open '%s'", devpath);
+		rc = 2;
 		goto exit;
 	}
 
-	/* initialize the naming deamon */
-	namedev_init();
+	udev = udev_device_init();
+	if (udev == NULL) {
+		info("can't open device");
+		rc = 3;
+		goto exit;
+	}
+
+	/* override built-in sysfs device */
+	udev->dev = dev;
+	strcpy(udev->action, "add");
+	udev->devt = udev_device_get_devt(udev);
+
+	/* simulate node creation with test flag */
+	udev->test_run = 1;
 
-	if (argv[2] != NULL)
-		subsystem = argv[2];
+	setenv("DEVPATH", udev->dev->devpath, 1);
+	setenv("SUBSYSTEM", udev->dev->subsystem, 1);
+	setenv("ACTION", "add", 1);
 
-	/* simulate node creation with fake flag */
-	udev_add_device(devpath, subsystem, FAKE);
+	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;
+
+		list_for_each_entry(name_loop, &udev->run_list, node) {
+			char program[PATH_SIZE];
+
+			strlcpy(program, name_loop->name, sizeof(program));
+			udev_rules_apply_format(udev, program, sizeof(program));
+			info("run: '%s'", program);
+		}
+	}
 
 exit:
-	return 0;
+	udev_rules_cleanup(&rules);
+	sysfs_cleanup();
+	return rc;
 }