miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use argz for libsodium version

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-07-15 13:36:31 +00:00
parent 84184c644a
commit a72075036a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@@ -4,6 +4,8 @@
#include <sodium.h> #include <sodium.h>
#include <stdio.h> #include <stdio.h>
#include "../argz/argz.h"
volatile sig_atomic_t gt_alarm; volatile sig_atomic_t gt_alarm;
volatile sig_atomic_t gt_reload; volatile sig_atomic_t gt_reload;
volatile sig_atomic_t gt_quit; volatile sig_atomic_t gt_quit;
@@ -47,7 +49,14 @@ gt_set_signal(void)
static int static int
gt_version(int argc, char **argv) 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()); printf("%s\n", sodium_version_string());
} else { } else {
printf("%s\n", PACKAGE_VERSION); printf("%s\n", PACKAGE_VERSION);