KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

musl: fix getopt optional argument processing

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43009
This commit is contained in:
Felix Fietkau 2014-10-21 11:03:20 +00:00
parent 4669d08e83
commit 4d5218e083
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
toolchain/musl/patches/110-getopt_optional_argument_fix.patch Normal file
View file

@ -0,0 +1,20 @@
--- a/src/misc/getopt.c
+++ b/src/misc/getopt.c
@@ -55,7 +55,9 @@ int getopt(int argc, char * const argv[]
return '?';
}
if (optstring[i+1] == ':') {
+ if (optstring[i+2] == ':') optarg = 0;
if (optind >= argc) {
+ if (optstring[i+2] == ':') return c;
if (optstring[0] == ':') return ':';
if (opterr) {
write(2, argv[0], strlen(argv[0]));
@@ -65,7 +67,6 @@ int getopt(int argc, char * const argv[]
}
return '?';
}
- if (optstring[i+2] == ':') optarg = 0;
if (optstring[i+2] != ':' || optpos) {
optarg = argv[optind++] + optpos;
optpos = 0;