rule-generator: net - whitelist NICs that violate MAC local scheme

[elogind.git] / udev / udevadm-test.c

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index ceeead0c8af42e812c9a4a1e0dc2ba248ae08169..c53c27329556e8a8e659262f6d9c36ab7979b183 100644 (file)
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -33,7 +33,6 @@
 int udevadm_test(struct udev *udev, int argc, char *argv[])
 {
        char filename[UTIL_PATH_SIZE];
-       int force = 0;
        const char *action = "add";
        const char *syspath = NULL;
        struct udev_event *event;
@@ -44,7 +43,6 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 
        static const struct option options[] = {
                { "action", required_argument, NULL, 'a' },
-               { "force", no_argument, NULL, 'f' },
                { "help", no_argument, NULL, 'h' },
                {}
        };
@@ -63,14 +61,10 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
                case 'a':
                        action = optarg;
                        break;
-               case 'f':
-                       force = 1;
-                       break;
                case 'h':
                        printf("Usage: udevadm test OPTIONS <syspath>\n"
                               "  --action=<string>     set action string\n"
-                              "  --force               don't skip node/link creation\n"
-                              "  --help                print this help text\n\n");
+                              "  --help\n\n");
                        exit(0);
                default:
                        exit(1);
@@ -89,7 +83,7 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
               "some values may be different, or not available at a simulation run.\n"
               "\n");
 
-       rules = udev_rules_new(udev, 0);
+       rules = udev_rules_new(udev, 1);
        if (rules == NULL) {
                fprintf(stderr, "error reading rules\n");
                rc = 1;
@@ -100,12 +94,14 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
        if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
                util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename));
                util_strlcat(filename, syspath, sizeof(filename));
-               syspath = filename;
+       } else {
+               util_strlcpy(filename, syspath, sizeof(filename));
        }
+       util_remove_trailing_chars(filename, '/');
 
-       dev = udev_device_new_from_syspath(udev, syspath);
+       dev = udev_device_new_from_syspath(udev, filename);
        if (dev == NULL) {
-               fprintf(stderr, "unable to open device '%s'\n", syspath);
+               fprintf(stderr, "unable to open device '%s'\n", filename);
                rc = 2;
                goto exit;
        }
@@ -116,11 +112,6 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 
        udev_device_set_action(dev, action);
        event = udev_event_new(dev);
-
-       /* simulate node creation with test flag */
-       if (!force)
-               event->test = 1;
-
        err = udev_event_execute_rules(event, rules);
 
        if (udev_device_get_event_timeout(dev) >= 0)