[PATCH] read %s{}-sysfs values at any device in the chain

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index 1e0037978beca92797abad2a628f7cb32fb4ef7d..f0c38b3a51b5fd7481e0782bb42a283f304978d7 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -26,21 +26,25 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <syslog.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_sysfs.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "logging.h"
 
 
 #ifdef USE_LOG
-void log_message (int level, const char *format, ...)
+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);
@@ -60,13 +64,15 @@ int main(int argc, char *argv[], char *envp[])
 
        info("version %s", UDEV_VERSION);
 
-       if (argc < 2 || argc > 3) {
-               info("Usage: udevtest <devpath> [subsystem]");
+       if (argc != 3) {
+               info("Usage: udevtest <devpath> <subsystem>");
                return 1;
        }
 
        /* initialize our configuration */
        udev_init_config();
+       if (udev_log_priority < LOG_INFO)
+               udev_log_priority = LOG_INFO;
 
        /* remove sysfs_path if given */
        if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
@@ -83,7 +89,7 @@ int main(int argc, char *argv[], char *envp[])
        info("looking at '%s'", devpath);
 
        /* initialize the naming deamon */
-       namedev_init();
+       udev_rules_init();
 
        if (argc == 3)
                subsystem = argv[2];