generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to current upstream getopt_long.

Browse Source 
Change-Id: I4c646dcb8be9e88dd54d069a03bbc5fbfd92de03
This commit is contained in:
Elliott Hughes 2013-06-25 14:48:10 -07:00
parent c76550b337
commit d278b828fe
5 changed files with 152 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@ -9,7 +9,6 @@ libc_common_src_files := \
unistd/alarm.c \ unistd/alarm.c \
unistd/exec.c \ unistd/exec.c \
unistd/fnmatch.c \ unistd/fnmatch.c \
unistd/getopt_long.c \
unistd/syslog.c \ unistd/syslog.c \
unistd/system.c \ unistd/system.c \
unistd/time.c \ unistd/time.c \
@ -279,6 +278,7 @@ libc_upstream_freebsd_src_files := \
upstream-freebsd/lib/libc/stdio/tempnam.c \ upstream-freebsd/lib/libc/stdio/tempnam.c \
upstream-freebsd/lib/libc/stdio/tmpnam.c \ upstream-freebsd/lib/libc/stdio/tmpnam.c \
upstream-freebsd/lib/libc/stdio/wsetup.c \ upstream-freebsd/lib/libc/stdio/wsetup.c \
upstream-freebsd/lib/libc/stdlib/getopt_long.c \
upstream-freebsd/lib/libc/stdlib/qsort.c \ upstream-freebsd/lib/libc/stdlib/qsort.c \
upstream-freebsd/lib/libc/stdlib/realpath.c \ upstream-freebsd/lib/libc/stdlib/realpath.c \
upstream-freebsd/lib/libc/string/wcpcpy.c \ upstream-freebsd/lib/libc/string/wcpcpy.c \

7
libc/NOTICE
View File

@ -3060,13 +3060,6 @@ are met:
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
This product includes software developed by the NetBSD
Foundation, Inc. and its contributors.
4. Neither the name of The NetBSD Foundation nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

44
libc/include/getopt.h
View File

@ -1,5 +1,5 @@
/* $OpenBSD: getopt.h,v 1.1 2002/12/03 20:24:29 millert Exp $ */
/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */ /* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */
/* $FreeBSD$ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@ -43,7 +36,8 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
/* /*
* GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
* getopt() is declared here too for GNU programs.
*/ */
#define no_argument 0 #define no_argument 0
#define required_argument 1 #define required_argument 1
@ -64,26 +58,20 @@ struct option {
}; };
__BEGIN_DECLS __BEGIN_DECLS
int getopt_long(int, char * const *, const char *, int getopt_long(int, char * const *, const char *,
const struct option *, int *); const struct option *, int *);
int getopt_long_only(int, char * const *, const char *, int getopt_long_only(int, char * const *, const char *,
const struct option *, int *); const struct option *, int *);
#ifndef _GETOPT_DEFINED_ #ifndef _GETOPT_DECLARED
#define _GETOPT_DEFINED_ #define _GETOPT_DECLARED
int getopt(int, char * const *, const char *); int getopt(int, char * const [], const char *);
extern char *optarg; /* getopt(3) external variables */
extern int opterr;
extern int optind;
extern int optopt;
extern int optreset;
#if 0 /* MISSING FROM BIONIC */
int getsubopt(char **, char * const *, char **);
extern char *suboptarg; /* getsubopt(3) external variable */
#endif /* MISSING */
extern char *optarg; /* getopt(3) external variables */
extern int optind, opterr, optopt;
#endif
#ifndef _OPTRESET_DECLARED
#define _OPTRESET_DECLARED
extern int optreset; /* getopt(3) external variable */
#endif #endif
__END_DECLS __END_DECLS

1
libc/upstream-freebsd/freebsd-compat.h
View File

@ -18,6 +18,7 @@
#define _BIONIC_FREEBSD_COMPAT_H_included #define _BIONIC_FREEBSD_COMPAT_H_included
#define __USE_BSD #define __USE_BSD
#define REPLACE_GETOPT
#define _close close #define _close close
#define _fcntl fcntl #define _fcntl fcntl

187
libc/unistd/getopt_long.c → libc/upstream-freebsd/lib/libc/stdlib/getopt_long.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: getopt_long.c,v 1.20 2005/10/25 15:49:37 jmc Exp $ */ /* $OpenBSD: getopt_long.c,v 1.22 2006/10/04 21:29:04 jmc Exp $ */
/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ /* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */
/* /*
@ -35,13 +35,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@ -56,22 +49,33 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#if 0
#if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$OpenBSD: getopt_long.c,v 1.16 2004/02/04 18:17:25 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#define GNU_COMPATIBLE /* Be more compatible, configure's use us! */
#if 0 /* we prefer to keep our getopt(3) */
#define REPLACE_GETOPT /* use this getopt as the system getopt(3) */ #define REPLACE_GETOPT /* use this getopt as the system getopt(3) */
#endif
#ifdef REPLACE_GETOPT #ifdef REPLACE_GETOPT
int opterr = 1; /* if error message should be printed */ int opterr = 1; /* if error message should be printed */
int optind = 1; /* index into parent argv vector */ int optind = 1; /* index into parent argv vector */
int optopt = '?'; /* character checked for validity */ int optopt = '?'; /* character checked for validity */
int optreset; /* reset getopt */
char *optarg; /* argument associated with option */ char *optarg; /* argument associated with option */
#endif #endif
int optreset; /* reset getopt */
#define PRINT_ERROR ((opterr) && (*options != ':')) #define PRINT_ERROR ((opterr) && (*options != ':'))
@ -86,10 +90,17 @@ int optreset; /* reset getopt */
#define EMSG "" #define EMSG ""
#ifdef GNU_COMPATIBLE
#define NO_PREFIX (-1)
#define D_PREFIX 0
#define DD_PREFIX 1
#define W_PREFIX 2
#endif
static int getopt_internal(int, char * const *, const char *, static int getopt_internal(int, char * const *, const char *,
const struct option *, int *, int); const struct option *, int *, int);
static int parse_long_options(char * const *, const char *, static int parse_long_options(char * const *, const char *,
const struct option *, int *, int); const struct option *, int *, int, int);
static int gcd(int, int); static int gcd(int, int);
static void permute_args(int, int, int, char * const *); static void permute_args(int, int, int, char * const *);
@ -101,11 +112,21 @@ static int nonopt_end = -1; /* first option after non options (for permute) */
/* Error messages */ /* Error messages */
static const char recargchar[] = "option requires an argument -- %c"; static const char recargchar[] = "option requires an argument -- %c";
static const char illoptchar[] = "illegal option -- %c"; /* From P1003.2 */
#ifdef GNU_COMPATIBLE
static int dash_prefix = NO_PREFIX;
static const char gnuoptchar[] = "invalid option -- %c";
static const char recargstring[] = "option `%s%s' requires an argument";
static const char ambig[] = "option `%s%.*s' is ambiguous";
static const char noarg[] = "option `%s%.*s' doesn't allow an argument";
static const char illoptstring[] = "unrecognized option `%s%s'";
#else
static const char recargstring[] = "option requires an argument -- %s"; static const char recargstring[] = "option requires an argument -- %s";
static const char ambig[] = "ambiguous option -- %.*s"; static const char ambig[] = "ambiguous option -- %.*s";
static const char noarg[] = "option doesn't take an argument -- %.*s"; static const char noarg[] = "option doesn't take an argument -- %.*s";
static const char illoptchar[] = "unknown option -- %c";
static const char illoptstring[] = "unknown option -- %s"; static const char illoptstring[] = "unknown option -- %s";
#endif
/* /*
* Compute the greatest common divisor of a and b. * Compute the greatest common divisor of a and b.
@ -169,14 +190,35 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end,
*/ */
static int static int
parse_long_options(char * const *nargv, const char *options, parse_long_options(char * const *nargv, const char *options,
const struct option *long_options, int *idx, int short_too) const struct option *long_options, int *idx, int short_too, int flags)
{ {
char *current_argv, *has_equal; char *current_argv, *has_equal;
#ifdef GNU_COMPATIBLE
char *current_dash;
#endif
size_t current_argv_len; size_t current_argv_len;
int i, match; int i, match, exact_match, second_partial_match;
current_argv = place; current_argv = place;
#ifdef GNU_COMPATIBLE
switch (dash_prefix) {
case D_PREFIX:
current_dash = "-";
break;
case DD_PREFIX:
current_dash = "--";
break;
case W_PREFIX:
current_dash = "-W ";
break;
default:
current_dash = "";
break;
}
#endif
match = -1; match = -1;
exact_match = 0;
second_partial_match = 0;
optind++; optind++;
@ -196,6 +238,7 @@ parse_long_options(char * const *nargv, const char *options,
if (strlen(long_options[i].name) == current_argv_len) { if (strlen(long_options[i].name) == current_argv_len) {
/* exact match */ /* exact match */
match = i; match = i;
exact_match = 1;
break; break;
} }
/* /*
@ -205,25 +248,37 @@ parse_long_options(char * const *nargv, const char *options,
if (short_too && current_argv_len == 1) if (short_too && current_argv_len == 1)
continue; continue;
if (match == -1) /* partial match */ if (match == -1) /* first partial match */
match = i; match = i;
else { else if ((flags & FLAG_LONGONLY) ||
/* ambiguous abbreviation */ long_options[i].has_arg !=
if (PRINT_ERROR) long_options[match].has_arg ||
fprintf(stderr, long_options[i].flag != long_options[match].flag ||
ambig, (int)current_argv_len, long_options[i].val != long_options[match].val)
current_argv); second_partial_match = 1;
optopt = 0; }
return (BADCH); if (!exact_match && second_partial_match) {
} /* ambiguous abbreviation */
if (PRINT_ERROR)
warnx(ambig,
#ifdef GNU_COMPATIBLE
current_dash,
#endif
(int)current_argv_len,
current_argv);
optopt = 0;
return (BADCH);
} }
if (match != -1) { /* option found */ if (match != -1) { /* option found */
if (long_options[match].has_arg == no_argument if (long_options[match].has_arg == no_argument
&& has_equal) { && has_equal) {
if (PRINT_ERROR) if (PRINT_ERROR)
fprintf(stderr, warnx(noarg,
noarg, (int)current_argv_len, #ifdef GNU_COMPATIBLE
current_argv); current_dash,
#endif
(int)current_argv_len,
current_argv);
/* /*
* XXX: GNU sets optopt to val regardless of flag * XXX: GNU sets optopt to val regardless of flag
*/ */
@ -231,7 +286,11 @@ parse_long_options(char * const *nargv, const char *options,
optopt = long_options[match].val; optopt = long_options[match].val;
else else
optopt = 0; optopt = 0;
#ifdef GNU_COMPATIBLE
return (BADCH);
#else
return (BADARG); return (BADARG);
#endif
} }
if (long_options[match].has_arg == required_argument || if (long_options[match].has_arg == required_argument ||
long_options[match].has_arg == optional_argument) { long_options[match].has_arg == optional_argument) {
@ -252,9 +311,11 @@ parse_long_options(char * const *nargv, const char *options,
* should be generated. * should be generated.
*/ */
if (PRINT_ERROR) if (PRINT_ERROR)
fprintf(stderr, warnx(recargstring,
recargstring, #ifdef GNU_COMPATIBLE
current_argv); current_dash,
#endif
current_argv);
/* /*
* XXX: GNU sets optopt to val regardless of flag * XXX: GNU sets optopt to val regardless of flag
*/ */
@ -271,7 +332,11 @@ parse_long_options(char * const *nargv, const char *options,
return (-1); return (-1);
} }
if (PRINT_ERROR) if (PRINT_ERROR)
fprintf(stderr, illoptstring, current_argv); warnx(illoptstring,
#ifdef GNU_COMPATIBLE
current_dash,
#endif
current_argv);
optopt = 0; optopt = 0;
return (BADCH); return (BADCH);
} }
@ -294,7 +359,7 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
{ {
char *oli; /* option letter list index */ char *oli; /* option letter list index */
int optchar, short_too; int optchar, short_too;
static int posixly_correct = -1; int posixly_correct; /* no static, can be changed on the fly */
if (options == NULL) if (options == NULL)
return (-1); return (-1);
@ -303,12 +368,18 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
* Disable GNU extensions if POSIXLY_CORRECT is set or options * Disable GNU extensions if POSIXLY_CORRECT is set or options
* string begins with a '+'. * string begins with a '+'.
*/ */
if (posixly_correct == -1) posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
posixly_correct = (getenv("POSIXLY_CORRECT") != NULL); #ifdef GNU_COMPATIBLE
if (*options == '-')
flags |= FLAG_ALLARGS;
else if (posixly_correct || *options == '+')
flags &= ~FLAG_PERMUTE;
#else
if (posixly_correct || *options == '+') if (posixly_correct || *options == '+')
flags &= ~FLAG_PERMUTE; flags &= ~FLAG_PERMUTE;
else if (*options == '-') else if (*options == '-')
flags |= FLAG_ALLARGS; flags |= FLAG_ALLARGS;
#endif
if (*options == '+' || *options == '-') if (*options == '+' || *options == '-')
options++; options++;
@ -344,7 +415,11 @@ start:
return (-1); return (-1);
} }
if (*(place = nargv[optind]) != '-' || if (*(place = nargv[optind]) != '-' ||
#ifdef GNU_COMPATIBLE
place[1] == '\0') {
#else
(place[1] == '\0' && strchr(options, '-') == NULL)) { (place[1] == '\0' && strchr(options, '-') == NULL)) {
#endif
place = EMSG; /* found non-option */ place = EMSG; /* found non-option */
if (flags & FLAG_ALLARGS) { if (flags & FLAG_ALLARGS) {
/* /*
@ -407,20 +482,26 @@ start:
if (long_options != NULL && place != nargv[optind] && if (long_options != NULL && place != nargv[optind] &&
(*place == '-' || (flags & FLAG_LONGONLY))) { (*place == '-' || (flags & FLAG_LONGONLY))) {
short_too = 0; short_too = 0;
if (*place == '-') #ifdef GNU_COMPATIBLE
dash_prefix = D_PREFIX;
#endif
if (*place == '-') {
place++; /* --foo long option */ place++; /* --foo long option */
else if (*place != ':' && strchr(options, *place) != NULL) #ifdef GNU_COMPATIBLE
dash_prefix = DD_PREFIX;
#endif
} else if (*place != ':' && strchr(options, *place) != NULL)
short_too = 1; /* could be short option too */ short_too = 1; /* could be short option too */
optchar = parse_long_options(nargv, options, long_options, optchar = parse_long_options(nargv, options, long_options,
idx, short_too); idx, short_too, flags);
if (optchar != -1) { if (optchar != -1) {
place = EMSG; place = EMSG;
return (optchar); return (optchar);
} }
} }
if (((optchar = (int)*place++) == (int)':') || if ((optchar = (int)*place++) == (int)':' ||
(optchar == (int)'-' && *place != '\0') || (optchar == (int)'-' && *place != '\0') ||
(oli = strchr(options, optchar)) == NULL) { (oli = strchr(options, optchar)) == NULL) {
/* /*
@ -432,8 +513,14 @@ start:
return (-1); return (-1);
if (!*place) if (!*place)
++optind; ++optind;
#ifdef GNU_COMPATIBLE
if (PRINT_ERROR) if (PRINT_ERROR)
fprintf(stderr, illoptchar, optchar); warnx(posixly_correct ? illoptchar : gnuoptchar,
optchar);
#else
if (PRINT_ERROR)
warnx(illoptchar, optchar);
#endif
optopt = optchar; optopt = optchar;
return (BADCH); return (BADCH);
} }
@ -444,13 +531,16 @@ start:
else if (++optind >= nargc) { /* no arg */ else if (++optind >= nargc) { /* no arg */
place = EMSG; place = EMSG;
if (PRINT_ERROR) if (PRINT_ERROR)
fprintf(stderr, recargchar, optchar); warnx(recargchar, optchar);
optopt = optchar; optopt = optchar;
return (BADARG); return (BADARG);
} else /* white space */ } else /* white space */
place = nargv[optind]; place = nargv[optind];
#ifdef GNU_COMPATIBLE
dash_prefix = W_PREFIX;
#endif
optchar = parse_long_options(nargv, options, long_options, optchar = parse_long_options(nargv, options, long_options,
idx, 0); idx, 0, flags);
place = EMSG; place = EMSG;
return (optchar); return (optchar);
} }
@ -461,24 +551,15 @@ start:
optarg = NULL; optarg = NULL;
if (*place) /* no white space */ if (*place) /* no white space */
optarg = place; optarg = place;
/* XXX: disable test for :: if PC? (GNU doesn't) */
else if (oli[1] != ':') { /* arg not optional */ else if (oli[1] != ':') { /* arg not optional */
if (++optind >= nargc) { /* no arg */ if (++optind >= nargc) { /* no arg */
place = EMSG; place = EMSG;
if (PRINT_ERROR) if (PRINT_ERROR)
fprintf(stderr, recargchar, optchar); warnx(recargchar, optchar);
optopt = optchar; optopt = optchar;
return (BADARG); return (BADARG);
} else } else
optarg = nargv[optind]; optarg = nargv[optind];
} else if (!(flags & FLAG_PERMUTE)) {
/*
* If permutation is disabled, we can accept an
* optional arg separated by whitespace so long
* as it does not start with a dash (-).
*/
if (optind + 1 < nargc && *nargv[optind + 1] != '-')
optarg = nargv[++optind];
} }
place = EMSG; place = EMSG;
++optind; ++optind;
@ -516,7 +597,7 @@ getopt(int nargc, char * const *nargv, const char *options)
*/ */
int int
getopt_long(int nargc, char * const *nargv, const char *options, getopt_long(int nargc, char * const *nargv, const char *options,
const struct option *long_options, int *idx) const struct option *long_options, int *idx)
{ {
return (getopt_internal(nargc, nargv, options, long_options, idx, return (getopt_internal(nargc, nargv, options, long_options, idx,
@ -529,7 +610,7 @@ getopt_long(int nargc, char * const *nargv, const char *options,
*/ */
int int
getopt_long_only(int nargc, char * const *nargv, const char *options, getopt_long_only(int nargc, char * const *nargv, const char *options,
const struct option *long_options, int *idx) const struct option *long_options, int *idx)
{ {
return (getopt_internal(nargc, nargv, options, long_options, idx, return (getopt_internal(nargc, nargv, options, long_options, idx,