emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-05 01:38:55 +02:00
parent 9f59849daa
commit 754e9f96de
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runit/sv.c
View File

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