Author: pfg
Date: Mon Jul 7 02:47:41 2014
New Revision: 268352
URL: http://svnweb.freebsd.org/changeset/base/268352
Log:
MFC r267745, r268268:
getopt(3): recognize option:: as GNU extension for "optional options".
Also ANSIfy a function declaration.
While here update the OpenBSD patch level in getopt_long.c as we
already have the corresponding change.
Obtained from: NetBSD
MFC after: 2 weeks
Modified:
stable/10/lib/libc/stdlib/getopt.3
stable/10/lib/libc/stdlib/getopt.c
stable/10/lib/libc/stdlib/getopt_long.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libc/stdlib/getopt.3
==============================================================================
--- stable/10/lib/libc/stdlib/getopt.3 Mon Jul 7 00:27:09 2014
(r268351)
+++ stable/10/lib/libc/stdlib/getopt.3 Mon Jul 7 02:47:41 2014
(r268352)
@@ -1,4 +1,4 @@
-.\" $NetBSD: getopt.3,v 1.31 2003/09/23 10:26:54 wiz Exp $
+.\" $NetBSD: getopt.3,v 1.34 2014/06/05 22:09:50 wiz Exp $
.\"
.\" Copyright (c) 1988, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -30,7 +30,7 @@
.\" @(#)getopt.3 8.5 (Berkeley) 4/27/95
.\" $FreeBSD$
.\"
-.Dd April 27, 1995
+.Dd June 5, 2014
.Dt GETOPT 3
.Os
.Sh NAME
@@ -65,6 +65,17 @@ The option string
may contain the following elements: individual characters, and
characters followed by a colon to indicate an option argument
is to follow.
+If an individual character is followed by two colons, then the
+option argument is optional;
+.Va optarg
+is set to the rest of the current
+.Va argv
+word, or
+.Dv NULL
+if there were no more characters in the current word.
+This is a
+.It Tn GNU
+extension.
For example, an option string
.Li \&"x"
recognizes an option
Modified: stable/10/lib/libc/stdlib/getopt.c
==============================================================================
--- stable/10/lib/libc/stdlib/getopt.c Mon Jul 7 00:27:09 2014
(r268351)
+++ stable/10/lib/libc/stdlib/getopt.c Mon Jul 7 02:47:41 2014
(r268352)
@@ -1,4 +1,4 @@
-/* $NetBSD: getopt.c,v 1.26 2003/08/07 16:43:40 agc Exp $ */
+/* $NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -59,10 +59,7 @@ char *optarg; /* argument associated wi
* Parse argc/argv argument vector.
*/
int
-getopt(nargc, nargv, ostr)
- int nargc;
- char * const nargv[];
- const char *ostr;
+getopt(int nargc, char * const nargv[], const char *ostr)
{
static char *place = EMSG; /* option letter processing */
char *oli; /* option letter list index */
@@ -115,6 +112,12 @@ getopt(nargc, nargv, ostr)
entire next argument. */
if (*place)
optarg = place;
+ else if (oli[2] == ':')
+ /*
+ * GNU Extension, for optional arguments if the rest of
+ * the argument is empty, we return NULL
+ */
+ optarg = NULL;
else if (nargc > ++optind)
optarg = nargv[optind];
else {
Modified: stable/10/lib/libc/stdlib/getopt_long.c
==============================================================================
--- stable/10/lib/libc/stdlib/getopt_long.c Mon Jul 7 00:27:09 2014
(r268351)
+++ stable/10/lib/libc/stdlib/getopt_long.c Mon Jul 7 02:47:41 2014
(r268352)
@@ -1,4 +1,4 @@
-/* $OpenBSD: getopt_long.c,v 1.22 2006/10/04 21:29:04 jmc Exp $ */
+/* $OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $ */
/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */
/*
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
