udevd: do not use syslog if --verbose (debugging) is used

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index 8c56dba0f1c7d3cc9e7adb5ed534fff13af244e2..418d43de14369a999c2423af5d13cad5727accb2 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <syslog.h>
 #include <getopt.h>
@@ -43,24 +44,64 @@ void log_message (int priority, const char *format, ...)
        va_start(args, format);
        vprintf(format, args);
        va_end(args);
-       if (format[strlen(format)-1] != '\n')
-               printf("\n");
+       printf("\n");
 }
 #endif
 
+static int import_uevent_var(const char *devpath)
+{
+       char path[PATH_SIZE];
+       static char value[4096]; /* must stay, used with putenv */
+       ssize_t size;
+       int fd;
+       char *key;
+       char *next;
+       int rc = -1;
+
+       /* read uevent file */
+       strlcpy(path, sysfs_path, sizeof(path));
+       strlcat(path, devpath, sizeof(path));
+       strlcat(path, "/uevent", sizeof(path));
+       fd = open(path, O_RDONLY);
+       if (fd < 0)
+               goto out;
+       size = read(fd, value, sizeof(value));
+       close(fd);
+       if (size < 0)
+               goto out;
+       value[size] = '\0';
+
+       /* import keys into environment */
+       key = value;
+       while (key[0] != '\0') {
+               next = strchr(key, '\n');
+               if (next == NULL)
+                       goto out;
+               next[0] = '\0';
+               info("import into environment: '%s'", key);
+               putenv(key);
+               key = &next[1];
+       }
+       rc = 0;
+out:
+       return rc;
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
        int force = 0;
        char *action = "add";
-       struct udev_rules rules = {};
+       char *subsystem = NULL;
        char *devpath = NULL;
        struct udevice *udev;
        struct sysfs_device *dev;
+       struct udev_rules rules = {};
        int retval;
        int rc = 0;
 
        static const struct option options[] = {
                { "action", 1, NULL, 'a' },
+               { "subsystem", 1, NULL, 's' },
                { "force", 0, NULL, 'f' },
                { "help", 0, NULL, 'h' },
                {}
@@ -79,7 +120,7 @@ int main(int argc, char *argv[], char *envp[])
        while (1) {
                int option;
 
-               option = getopt_long(argc, argv, "a:fh", options, NULL);
+               option = getopt_long(argc, argv, "a:s:fh", options, NULL);
                if (option == -1)
                        break;
 
@@ -88,14 +129,18 @@ int main(int argc, char *argv[], char *envp[])
                case 'a':
                        action = optarg;
                        break;
+               case 's':
+                       subsystem = optarg;
+                       break;
                case 'f':
                        force = 1;
                        break;
                case 'h':
-                       printf("Usage: udevtest [--action=<string>] [--force] [--help] <devpath>\n"
-                              "  --action=<string>   set action string\n"
-                              "  --force             don't skip node/link creation\n"
-                              "  --help              print this help text\n\n");
+                       printf("Usage: udevtest OPTIONS <devpath>\n"
+                              "  --action=<string>     set action string\n"
+                              "  --subsystem=<string>  set subsystem string\n"
+                              "  --force               don't skip node/link creation\n"
+                              "  --help                print this help text\n\n");
                        exit(0);
                default:
                        exit(1);
@@ -109,6 +154,11 @@ int main(int argc, char *argv[], char *envp[])
                goto exit;
        }
 
+       printf("This program is for debugging only, it does not run any program,\n"
+              "specified by a RUN key. It may show incorrect results, because\n"
+              "some values may be different, or not available at a simulation run.\n"
+              "\n");
+
        sysfs_init();
        udev_rules_init(&rules, 0);
 
@@ -130,9 +180,12 @@ int main(int argc, char *argv[], char *envp[])
                goto exit;
        }
 
+       if (subsystem != NULL)
+               strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
+
        /* override built-in sysfs device */
        udev->dev = dev;
-       strcpy(udev->action, action);
+       strlcpy(udev->action, action, sizeof(udev->action));
        udev->devt = udev_device_get_devt(udev);
 
        /* simulate node creation with test flag */
@@ -141,12 +194,8 @@ int main(int argc, char *argv[], char *envp[])
 
        setenv("DEVPATH", udev->dev->devpath, 1);
        setenv("SUBSYSTEM", udev->dev->subsystem, 1);
-       setenv("ACTION", "add", 1);
-
-       printf("This program is for debugging only, it does not run any program,\n"
-              "specified by a RUN key. It may show incorrect results, if rules\n"
-              "match against subsystem specfic kernel event variables.\n"
-              "\n");
+       setenv("ACTION", udev->action, 1);
+       import_uevent_var(udev->dev->devpath);
 
        info("looking at device '%s' from subsystem '%s'", udev->dev->devpath, udev->dev->subsystem);
        retval = udev_device_event(&rules, udev);
@@ -161,6 +210,7 @@ int main(int argc, char *argv[], char *envp[])
                        info("run: '%s'", program);
                }
        }
+       udev_device_cleanup(udev);
 
 exit:
        udev_rules_cleanup(&rules);