summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-09-22 23:45:23 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-09-22 23:45:23 +0000
commit283bca19c1129f8db61c24440779f8424ab44db9 (patch)
tree5387cb35858da9c8589cb35bf2690eca564fc18b /lib/libc/stdlib
parent0e6f6c187d7a36cc93d441be83105cabf30edd5d (diff)
If permutation is disabled (as it is via getopt(3) or when POSIXLY_CORRECT
is set), we can accept an optional arg separated by whitespace. Previously, the optional arg needed to be adjacent to the option character. deraadt@ OK
Diffstat (limited to 'lib/libc/stdlib')
-rw-r--r--lib/libc/stdlib/getopt_long.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index 124893051ca..1f7f5baa8b5 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.14 2003/06/17 21:56:24 millert Exp $ */
+/* $OpenBSD: getopt_long.c,v 1.15 2003/09/22 23:45:22 millert Exp $ */
/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */
/*
@@ -57,7 +57,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getopt_long.c,v 1.14 2003/06/17 21:56:24 millert Exp $";
+static char *rcsid = "$OpenBSD: getopt_long.c,v 1.15 2003/09/22 23:45:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <err.h>
@@ -472,6 +472,13 @@ start:
return (BADARG);
} else
optarg = nargv[optind];
+ } else if (!(flags & FLAG_PERMUTE)) {
+ /*
+ * If permutation is disabled, we can accept an
+ * optional arg separated by whitespace.
+ */
+ if (optind + 1 < nargc)
+ optarg = nargv[++optind];
}
place = EMSG;
++optind;