1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libc/stdlib/getopt.c b/src/lib/libc/stdlib/getopt.c
index 63c5e6a479..fc0f8c1bc7 100644
--- a/src/lib/libc/stdlib/getopt.c
+++ b/src/lib/libc/stdlib/getopt.c
@@ -32,8 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/* static char sccsid[] = "from: @(#)getopt.c   8.2 (Berkeley) 4/2/94"; */
-static char *rcsid = "$Id: getopt.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
+static char *rcsid = "$OpenBSD: getopt.c,v 1.4 2002/12/08 22:57:14 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -64,6 +63,9 @@ getopt(nargc, nargv, ostr)
         static char *place = EMSG;              /* option letter processing */
         char *oli;                              /* option letter list index */
 
+        if (ostr == NULL)
+                return (-1);
+
         if (optreset || !*place) {              /* update scanning pointer */
                 optreset = 0;
                 if (optind >= nargc || *(place = nargv[optind]) != '-') {