udevadm: fix option parsing breakage with klibc

[elogind.git] / udev / udevadm.c

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 3f2c78212ea139d522fc3a859a57db18497387a2..0927981ab284371460cbcb39e66ece82ba154568 100644 (file)
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 
        logging_init("udevadm");
        udev_set_log_fn(udev, log_fn);
-       sysfs_init();
+       udev_selinux_init(udev);
 
        /* see if we are a compat link, this will be removed in a future release */
        command = argv[0];
@@ -200,7 +200,9 @@ int main(int argc, char *argv[])
        if (command != NULL)
                for (i = 0; cmds[i].cmd != NULL; i++) {
                        if (strcmp(cmds[i].name, command) == 0) {
-                               optind++;
+                               argc -= optind;
+                               argv += optind;
+                               optind = 0;
                                rc = run_command(udev, &cmds[i], argc, argv);
                                goto out;
                        }
@@ -210,7 +212,7 @@ int main(int argc, char *argv[])
        help(udev, argc, argv);
        rc = 2;
 out:
-       sysfs_cleanup();
+       udev_selinux_exit(udev);
        udev_unref(udev);
        logging_close();
        return rc;