mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix optind in the windows getopt. addresses #1747

Browse source 
git-svn-id: file:///svn/toku/tokudb@11784 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2013-04-16 23:57:52 -04:00 • committed by Yoni Fogel
parent 57eeb44d61
commit 2dda17b390
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
windows/getopt.c
View file

@ -1,3 +1,4 @@
#include <stdio.h>
#include <unistd.h>
char *optarg;
@ -16,32 +17,44 @@ int getopt(int argc, char * const argv[], const char *optstring) {
static int nextchar = 0;
char *arg;
const char *theopt;
// first time initialization
if (nextargc == 0) {
nextargc = 1;
optind = 1;
nextchar = 0;
}
again:
optarg = 0;
if (nextargc >= argc) {
nextargc = 0;
optind = nextargc;
// last arg
if (nextargc >= argc)
return -1;
}
arg = argv[nextargc];
if (!nextchar) {
arg = argv[nextargc];
if (arg[0] != '-') {
nextargc = 0;
return -1;
}
nextchar = 1;
}
theopt = match(arg[nextchar++], optstring);
if (!theopt) {
if (!arg[nextchar]) {
nextargc++;
nextchar = 0;
goto again;
}
if (!nextchar) {
// not an option
if (arg[0] != '-')
return -1;
// end of options "--"
if (arg[1] == '-') {
nextargc++;
optind = nextargc;
return -1;
}
nextchar = 1;
}
// try to match the arg with the options
theopt = match(arg[nextchar++], optstring);
if (!theopt)
return '?';
if (theopt[1] == ':') {
if (arg[nextchar]) {
optarg = &arg[nextchar];
@ -57,7 +70,6 @@ again:
optarg = argv[nextargc++];
}
}
optind = nextargc;
return theopt[0];
}