svc: fix a case where with more than option, getopt() state is not reset

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/runit/sv.c b/runit/sv.c
index faa31d4fa..b39815613 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -718,15 +718,16 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
         argv[1] = command;
         command[1] = '\0';
 
-        /* getopt32() was already called:
-         * reset the libc getopt() function, which keeps internal state.
-         */
-        GETOPT_RESET();
-
         do {
                 if (opts & 1) {
                         int r;
+
                         command[0] = *optstring;
+
+                        /* getopt() was already called by getopt32():
+                         * reset the libc getopt() function's internal state.
+                         */
+                        GETOPT_RESET();
                         r = sv(argv);
                         if (r)
                                 return 1;