diff options
| author | ache <ache@FreeBSD.org> | 2004-07-06 13:58:45 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2004-07-06 13:58:45 +0000 |
| commit | fb8e8fa13147842d7e614acc80f381ae7a697535 (patch) | |
| tree | f5013f0db7d4264d676cd0492e984c67f55f9343 /lib | |
| parent | badb28509a8b4ae3de678d1cbdfb8cba88d282c1 (diff) | |
| download | FreeBSD-src-fb8e8fa13147842d7e614acc80f381ae7a697535.zip FreeBSD-src-fb8e8fa13147842d7e614acc80f381ae7a697535.tar.gz | |
Keep it sync with OpenBSD:
An optional argument cannot start with '-', even if permutation is
disabled.
Obtained from: OpenBSD getopt_long.c v1.17
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/stdlib/getopt_long.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c index 28e24ae..47eab1f 100644 --- a/lib/libc/stdlib/getopt_long.c +++ b/lib/libc/stdlib/getopt_long.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getopt_long.c,v 1.16 2004/02/04 18:17:25 millert Exp $ */ +/* $OpenBSD: getopt_long.c,v 1.17 2004/06/03 18:46:52 millert Exp $ */ /* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ /* @@ -571,9 +571,10 @@ start: } else if (!(flags & FLAG_PERMUTE)) { /* * If permutation is disabled, we can accept an - * optional arg separated by whitespace. + * optional arg separated by whitespace so long + * as it does not start with a dash (-). */ - if (optind + 1 < nargc) + if (optind + 1 < nargc && *nargv[optind + 1] != '-') optarg = nargv[++optind]; } place = EMSG; |
