RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

getopt: fix optional argument processing 

Processing an option character with optional argument fails if the
option is last on the command line. This happens because the
if (optind >= argc) check runs first before testing for optional
argument.
This commit is contained in:
Felix Fietkau 2014-10-21 22:24:50 +02:00 committed by Rich Felker
parent 941644e98c
commit acccc93e08
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc/getopt.c
View File

@ -55,7 +55,8 @@ int getopt(int argc, char * const argv[], const char *optstring)
return '?';
}
if (optstring[i+1] == ':') {
if (optind >= argc) {
if (optstring[i+2] == ':') optarg = 0;
else if (optind >= argc) {
if (optstring[0] == ':') return ':';
if (opterr) {
write(2, argv[0], strlen(argv[0]));
@ -65,7 +66,6 @@ int getopt(int argc, char * const argv[], const char *optstring)
}
return '?';
}
if (optstring[i+2] == ':') optarg = 0;
if (optstring[i+2] != ':' || optpos) {
optarg = argv[optind++] + optpos;
optpos = 0;