From a72075036a58912657b9a4224ec9c357cfe48d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= Date: Mon, 15 Jul 2019 13:36:31 +0000 Subject: [PATCH] Use argz for libsodium version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adrien Gallouët --- src/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index e687836..83f19be 100644 --- a/src/main.c +++ b/src/main.c @@ -4,6 +4,8 @@ #include #include +#include "../argz/argz.h" + volatile sig_atomic_t gt_alarm; volatile sig_atomic_t gt_reload; volatile sig_atomic_t gt_quit; @@ -47,7 +49,14 @@ gt_set_signal(void) static int gt_version(int argc, char **argv) { - if (argc == 2 && !str_cmp(argv[1], "libsodium")) { + struct argz version_argz[] = { + {"libsodium", NULL, NULL, argz_option}, + {NULL}}; + + if (argz(version_argz, argc, argv)) + return 1; + + if (argz_is_set(version_argz, "libsodium")) { printf("%s\n", sodium_version_string()); } else { printf("%s\n", PACKAGE_VERSION);