From 117cc3bed04f79845762031abb5d85453524d33e Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 28 Aug 2014 13:39:07 +0000 Subject: Add option handling for ordered flags. --- src/usr.bin/openssl/apps.c | 7 ++++++- src/usr.bin/openssl/apps.h | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c index 4ae6f12c18..f69613e586 100644 --- a/src/usr.bin/openssl/apps.c +++ b/src/usr.bin/openssl/apps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.c,v 1.4 2014/08/28 13:37:41 jsing Exp $ */ +/* $OpenBSD: apps.c,v 1.5 2014/08/28 13:39:07 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -2257,6 +2257,7 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed) struct option *opt; long long val; char *arg, *p; + int ord = 0; int i, j; for (i = 1; i < argc; i++) { @@ -2311,6 +2312,10 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed) *opt->opt.flag = 1; break; + case OPTION_FLAG_ORD: + *opt->opt.flag = ++ord; + break; + case OPTION_VALUE: *opt->opt.value = opt->value; break; diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h index fefceb7ddb..3ea855f684 100644 --- a/src/usr.bin/openssl/apps.h +++ b/src/usr.bin/openssl/apps.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.h,v 1.4 2014/08/28 13:37:41 jsing Exp $ */ +/* $OpenBSD: apps.h,v 1.5 2014/08/28 13:39:07 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -291,6 +291,7 @@ struct option { OPTION_ARG_FORMAT, OPTION_ARG_INT, OPTION_FLAG, + OPTION_FLAG_ORD, OPTION_VALUE, } type; union { -- cgit v1.2.3-55-g6feb