From 030e52639248ac8417a4934298caa78c21a228d1 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 30 Sep 2012 20:00:38 -0400 Subject: add getopt reset support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit based on proposed patches by Daniel Cegiełka, with minor changes: - use a weak symbol for optreset so it doesn't clash with namespace - also reset optpos (position in multi-option arg like -lR) - also make getopt_long support reset --- src/misc/getopt.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/misc/getopt.c') diff --git a/src/misc/getopt.c b/src/misc/getopt.c index abf0e847..35880a09 100644 --- a/src/misc/getopt.c +++ b/src/misc/getopt.c @@ -3,10 +3,13 @@ #include #include #include +#include "libc.h" char *optarg; -int optind=1, opterr=1, optopt; -static int optpos; +int optind=1, opterr=1, optopt, __optpos, __optreset=0; + +#define optpos __optpos +weak_alias(__optreset, optreset); int getopt(int argc, char * const argv[], const char *optstring) { @@ -15,6 +18,12 @@ int getopt(int argc, char * const argv[], const char *optstring) int k, l; char *optchar; + if (!optind || __optreset) { + __optreset = 0; + __optpos = 0; + optind = 1; + } + if (optind >= argc || !argv[optind] || argv[optind][0] != '-' || !argv[optind][1]) return -1; if (argv[optind][1] == '-' && !argv[optind][2]) -- cgit v1.2.1