diff options
author | jsing <> | 2014-08-28 13:39:07 +0000 |
---|---|---|
committer | jsing <> | 2014-08-28 13:39:07 +0000 |
commit | 117cc3bed04f79845762031abb5d85453524d33e (patch) | |
tree | f0af94ff68ab7f3ae041a036127d13daa246b4de /src | |
parent | 1997202bee0a7c4cd631a99cd43a4c761e839090 (diff) | |
download | openbsd-117cc3bed04f79845762031abb5d85453524d33e.tar.gz openbsd-117cc3bed04f79845762031abb5d85453524d33e.tar.bz2 openbsd-117cc3bed04f79845762031abb5d85453524d33e.zip |
Add option handling for ordered flags.
Diffstat (limited to 'src')
-rw-r--r-- | src/usr.bin/openssl/apps.c | 7 | ||||
-rw-r--r-- | 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 @@ | |||
1 | /* $OpenBSD: apps.c,v 1.4 2014/08/28 13:37:41 jsing Exp $ */ | 1 | /* $OpenBSD: apps.c,v 1.5 2014/08/28 13:39:07 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -2257,6 +2257,7 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed) | |||
2257 | struct option *opt; | 2257 | struct option *opt; |
2258 | long long val; | 2258 | long long val; |
2259 | char *arg, *p; | 2259 | char *arg, *p; |
2260 | int ord = 0; | ||
2260 | int i, j; | 2261 | int i, j; |
2261 | 2262 | ||
2262 | for (i = 1; i < argc; i++) { | 2263 | for (i = 1; i < argc; i++) { |
@@ -2311,6 +2312,10 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed) | |||
2311 | *opt->opt.flag = 1; | 2312 | *opt->opt.flag = 1; |
2312 | break; | 2313 | break; |
2313 | 2314 | ||
2315 | case OPTION_FLAG_ORD: | ||
2316 | *opt->opt.flag = ++ord; | ||
2317 | break; | ||
2318 | |||
2314 | case OPTION_VALUE: | 2319 | case OPTION_VALUE: |
2315 | *opt->opt.value = opt->value; | 2320 | *opt->opt.value = opt->value; |
2316 | break; | 2321 | 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 @@ | |||
1 | /* $OpenBSD: apps.h,v 1.4 2014/08/28 13:37:41 jsing Exp $ */ | 1 | /* $OpenBSD: apps.h,v 1.5 2014/08/28 13:39:07 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -291,6 +291,7 @@ struct option { | |||
291 | OPTION_ARG_FORMAT, | 291 | OPTION_ARG_FORMAT, |
292 | OPTION_ARG_INT, | 292 | OPTION_ARG_INT, |
293 | OPTION_FLAG, | 293 | OPTION_FLAG, |
294 | OPTION_FLAG_ORD, | ||
294 | OPTION_VALUE, | 295 | OPTION_VALUE, |
295 | } type; | 296 | } type; |
296 | union { | 297 | union { |