udev: set optind = 0, not the usual 1, to reset getopt_long()s internal state

diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 18fc3df274936b637c7a5431551207715f048605..26ee16c6696e38b9cba626a8da68d38f4cc81b2b 100644 (file)
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -127,7 +127,8 @@ int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c
         int argc;
         char *argv[128];
 
         int argc;
         char *argv[128];
 

-        optind = 1;
+        /* we need '0' here to reset the internal state */
+        optind = 0;

         util_strscpy(arg, sizeof(arg), command);
         udev_build_argv(udev_device_get_udev(dev), arg, &argc, argv);
         return builtins[cmd]->cmd(dev, argc, argv, test);
         util_strscpy(arg, sizeof(arg), command);
         udev_build_argv(udev_device_get_udev(dev), arg, &argc, argv);
         return builtins[cmd]->cmd(dev, argc, argv, test);

diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index d1e9756b2e5f3417e95c5cbead0c58f8348b9770..5e69e192c03bd75d1e8e2ebe3b63d98e5846ece8 100644 (file)
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -134,7 +134,8 @@ int main(int argc, char *argv[])
                         if (strcmp(udevadm_cmds[i]->name, command) == 0) {
                                 argc -= optind;
                                 argv += optind;
                         if (strcmp(udevadm_cmds[i]->name, command) == 0) {
                                 argc -= optind;
                                 argv += optind;

-                                optind = 1;
+                                /* we need '0' here to reset the internal state */
+                                optind = 0;

                                 rc = run_command(udev, udevadm_cmds[i], argc, argv);
                                 goto out;
                         }
                                 rc = run_command(udev, udevadm_cmds[i], argc, argv);
                                 goto out;
                         }