From 754e9f96defd7be48dfdc9ffe820c3fb7f35ff9e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 5 Aug 2017 01:38:55 +0200 Subject: svc: fix a case where with more than option, getopt() state is not reset Signed-off-by: Denys Vlasenko --- runit/sv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'runit') diff --git a/runit/sv.c b/runit/sv.c index 3dd02550a..3267c7e4c 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; -- cgit v1.2.3