===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/apps.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- src/usr.bin/openssl/apps.c	2014/12/28 15:05:38	1.17
+++ src/usr.bin/openssl/apps.c	2014/12/28 15:48:52	1.18
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.17 2014/12/28 15:05:38 jsing Exp $ */
+/* $OpenBSD: apps.c,v 1.18 2014/12/28 15:48:52 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -2242,7 +2242,8 @@
 }
 
 int
-options_parse(int argc, char **argv, struct option *opts, char **unnamed)
+options_parse(int argc, char **argv, struct option *opts, char **unnamed,
+    int *argsused)
 {
 	const char *errstr;
 	struct option *opt;
@@ -2260,6 +2261,8 @@
 
 		/* Single unnamed argument (without leading hyphen). */
 		if (*p++ != '-') {
+			if (argsused != NULL)
+				goto done;
 			if (unnamed == NULL)
 				goto unknown;
 			if (*unnamed != NULL)
@@ -2343,6 +2346,10 @@
 			return (1);
 		}
 	}
+
+done:
+	if (argsused != NULL)
+		*argsused = i;
 
 	return (0);