Implement table-driven option parsing that allows an application to

specify what its valid options are and where it wants them to be stored.
This also allows for usage to be generated, almost for free, ensuring
that the options and usage are automatically kept in sync.

This will allow for a single option parsing implementation, rather than the
current one-hand-rolled-option-parsing-and-random-usage-implementation per
application.

As a starting point, port the openssl(1) rand application to the new option
parsing and usage (along with associated code clean up).

With input from doug@.

ok bcook@ doug@

1 files changed, 21 insertions, 1 deletions

diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h
index 38c5f4be8c..64e581b969 100644
--- a/src/usr.bin/openssl/apps.h
+++ b/src/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: apps.h,v 1.2 2014/08/27 14:59:44 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -282,4 +282,24 @@ double app_tminterval (int stop, int usertime);
 
 #define OPENSSL_NO_SSL_INTERN
 
+struct option {
+        const char *name;
+        const char *argname;
+        const char *desc;
+        enum {
+                OPTION_ARG,
+                OPTION_FLAG,
+                OPTION_VALUE,
+        } type;
+        union {
+                char **arg;
+                int *flag;
+                int *value;
+        } opt;
+        const int value;
+};
+
+void options_usage(struct option *opts);
+int options_parse(int argc, char **argv, struct option *opts, char **unnamed);
+
 #endif