Add option type OPTION_ORDER

To handle incremental order value, added new option type OPTION_ORDER.
openssl(1) x509 requires this option handling, since,
- -CA and -signkey require to set both filename and incremental 'num'.
- -dates requires to set two variables in a row, startdate and enddate.
and this couldn't be solved by OPTION_FLAG_ORD.

ok tb@ and "I'd move forward with your current plan." from jsing@

1 files changed, 4 insertions, 1 deletions

diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h
index 10612a9c97..d5f3706ee7 100644
--- a/src/usr.bin/openssl/apps.h
+++ b/src/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.24 2020/09/09 12:47:46 inoguchi Exp $ */
+/* $OpenBSD: apps.h,v 1.25 2021/03/24 12:07:39 inoguchi Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -304,6 +304,7 @@ struct option {
                 OPTION_VALUE_AND,
                 OPTION_VALUE_OR,
                 OPTION_UL_VALUE_OR,
+                OPTION_ORDER,
         } type;
         union {
                 char **arg;
@@ -315,9 +316,11 @@ struct option {
                 int *value;
                 unsigned long *ulvalue;
                 time_t *tvalue;
+                int *order;
         } opt;
         const int value;
         const unsigned long ulvalue;
+        int *order;
 };
 
 void options_usage(const struct option *opts);