--- Libc/Libc-1725.40.4/stdlib/FreeBSD/getopt.c
+++ Libc/Libc-583/stdlib/FreeBSD/getopt.c
@@ -1,8 +1,6 @@
-/*	$NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $	*/
+/*	$NetBSD: getopt.c,v 1.26 2003/08/07 16:43:40 agc Exp $	*/
 
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -14,7 +12,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -35,7 +37,7 @@
 static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt.c,v 1.7 2004/03/06 17:05:45 ache Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
@@ -54,20 +56,17 @@
 
 #define	BADCH	(int)'?'
 #define	BADARG	(int)':'
-static char EMSG[] = "";
-
-#if __DARWIN_UNIX03
-#define PROGNAME nargv[0]
-#else
-#define PROGNAME _getprogname()
-#endif
+#define	EMSG	""
 
 /*
  * getopt --
  *	Parse argc/argv argument vector.
  */
 int
-getopt(int nargc, char * const nargv[], const char *ostr)
+getopt(nargc, nargv, ostr)
+	int nargc;
+	char * const nargv[];
+	const char *ostr;
 {
 	static char *place = EMSG;		/* option letter processing */
 	char *oli;				/* option letter list index */
@@ -104,8 +103,8 @@
 			++optind;
 		if (opterr && *ostr != ':')
 			(void)fprintf(stderr,
-			    "%s: illegal option -- %c\n",
-			    PROGNAME, optopt);
+			    "%s: illegal option -- %c\n", _getprogname(),
+			    optopt);
 		return (BADCH);
 	}
 
@@ -120,29 +119,17 @@
 		   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 {
 			/* option-argument absent */
-#if __DARWIN_UNIX03
-			/* Yes, the standard will put optind past the last
-			   argument */
-			++optind;
-			optarg = NULL;
-#endif /* __DARWIN_UNIX03 */
 			place = EMSG;
 			if (*ostr == ':')
 				return (BADARG);
 			if (opterr)
 				(void)fprintf(stderr,
 				    "%s: option requires an argument -- %c\n",
-				    PROGNAME, optopt);
+				    _getprogname(), optopt);
 			return (BADCH);
 		}
 		place = EMSG;