From 0e4c4d11086a2f00998b0426bffd25a6b1495101 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Mon, 27 Feb 2006 15:09:48 +0000 Subject: Add Rich Felker's getopt_long to be used in conjunction w/ the SuSv3 getopt --- libc/unistd/Makefile.in | 5 +++- libc/unistd/getopt_long-susv3.c | 58 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 libc/unistd/getopt_long-susv3.c (limited to 'libc/unistd') diff --git a/libc/unistd/Makefile.in b/libc/unistd/Makefile.in index 5bd612465..6e85e10c9 100644 --- a/libc/unistd/Makefile.in +++ b/libc/unistd/Makefile.in @@ -19,9 +19,12 @@ CSRC := $(filter-out daemon.c,$(CSRC)) endif ifeq ($(UCLIBC_HAS_GNU_GETOPT),y) -CSRC := $(filter-out getopt-susv3.c,$(CSRC)) +CSRC := $(filter-out getopt-susv3.c getopt_long-susv3.c,$(CSRC)) else CSRC := $(filter-out getopt.c,$(CSRC)) +ifneq ($(UCLIBC_HAS_GETOPT_LONG),y) +CSRC := $(filter-out getopt_long-susv3.c,$(CSRC)) +endif endif ifeq ($(UCLIBC_HAS_GNU_GETSUBOPT),y) diff --git a/libc/unistd/getopt_long-susv3.c b/libc/unistd/getopt_long-susv3.c new file mode 100644 index 000000000..9bae3d845 --- /dev/null +++ b/libc/unistd/getopt_long-susv3.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2006 Rich Felker + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + */ + +#include +#include +#include + +libc_hidden_proto(getopt) + +static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly) +{ + if (optind >= argc || !argv[optind] || argv[optind][0] != '-') return -1; + if ((longonly && argv[optind][1]) || + (argv[optind][1] == '-' && argv[optind][2])) + { + int i; + char *opt = argv[optind]+2; + for (i=0; longopts[i].name; i++) { + const char *name = longopts[i].name; + while (*name && *name++ == *opt++); + if (*name && *opt != '=') continue; + if (*opt == '=') { + if (!longopts[i].has_arg) continue; + optarg = opt+1; + } else { + if (longopts[i].has_arg == required_argument) { + if (!(optarg = argv[++optind])) + return ':'; + } else optarg = NULL; + } + optind++; + if (idx) *idx = i; + if (longopts[i].flag) { + *longopts[i].flag = longopts[i].val; + return 0; + } + return longopts[i].val; + } + if (argv[optind][1] == '-') { + optind++; + return '?'; + } + } + return getopt(argc, argv, optstring); +} + +int getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx) +{ + return __getopt_long(argc, argv, optstring, longopts, idx, 0); +} + +int getopt_long_only(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx) +{ + return __getopt_long(argc, argv, optstring, longopts, idx, 1); +} -- cgit v1.2.3