main: add more information to `nft -V`.
Pablo Neira Ayuso
maintainerPATCH 1/1 main: add more information to `nft -V`.
From: Jeremy Sowden <[email protected]>
In addition to the package-version and release-name, output the CLI implementation (if any) and whether mini-gmp was used, e.g.:
$ ./src/nft -V
nftables v0.9.3 (Topsy)
cli: linenoise
minigmp: no---
Hi Jeremy et al.
I'm revisiting this one, it's basically your patch with a few mangling.
I wonder if it's probably a good idea to introduce a long version mode. I have seen other tools providing more verbose information about all build information.
The idea would be to leave -v/--version as it is, and introduce -V which would be more verbose.
Thanks.
src/Makefile.am | 3 +++ src/main.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-)
src/Makefile.am +3 -0
@@ -13,6 +13,9 @@ endif if BUILD_XTABLES AM_CPPFLAGS += ${XTABLES_CFLAGS} endif +if BUILD_MINIGMP +AM_CPPFLAGS += -DHAVE_MINIGMP +endif AM_CFLAGS = -Wall \ -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \
src/main.c +31 -1
@@ -27,6 +27,7 @@ static struct nft_ctx *nft;enum opt_vals {OPT_HELP ='h' ,OPT_VERSION ='v' , +OPT_VERSION_LONG ='V' ,OPT_CHECK ='c' ,OPT_FILE ='f' ,OPT_INTERACTIVE ='i' ,
@@ -46,7 +47,7 @@ enum opt_vals {OPT_TERSE ='t' , OPT_INVALID = '?', }; -#define OPTSTRING "+hvd:cf:iI:jvnsNaeSupypTt" +#define OPTSTRING "+hvVd:cf:iI:jvnsNaeSupypTt"static const struct option options[] = { {
@@ -141,6 +142,7 @@ static void show_help(const char *name)"Options:\n" " -h, --help Show this help\n" " -v, --version Show version information\n" +" -V Show extended version information\n" "\n" " -c, --check Check commands validity without actually applying the changes.\n" " -f, --file <filename> Read input from <filename>\n"
@@ -164,6 +166,31 @@ static void show_help(const char *name) name, DEFAULT_INCLUDE_PATH); } +static void show_version (void ) +{ +const char *cli, *minigmp; + +#if defined(HAVE_LIBREADLINE ) + cli ="readline" ; +#elif defined(HAVE_LIBLINENOISE ) + cli ="linenoise" ; +#else + cli ="no" ; +#endif + +#if defined(HAVE_MINIGMP ) + minigmp ="yes" ; +#else + minigmp ="no" ; +#endif + +printf ("%s v%s (%s)\n" +" cli: %s\n" +" minigmp: %s\n" , +PACKAGE_NAME ,PACKAGE_VERSION ,RELEASE_NAME , + cli, minigmp); +} + static const struct { const char *name; enum nft_debug_level level;
@@ -272,6 +299,9 @@ int main(int argc, char * const *argv)printf ("%s v%s (%s)\n" ,PACKAGE_NAME ,PACKAGE_VERSION ,RELEASE_NAME );exit (EXIT_SUCCESS ); +case OPT_VERSION_LONG : +show_version (); +exit (EXIT_SUCCESS );case OPT_CHECK :nft_ctx_set_dry_run (nft, true);break ;
Signature · 1 line
2.11.0
Quoted 18 lines · Pablo Neira Ayuso
From: Jeremy Sowden <[email protected]>
In addition to the package-version and release-name, output the CLI implementation (if any) and whether mini-gmp was used, e.g.:
$ ./src/nft -V nftables v0.9.3 (Topsy) cli: linenoise minigmp: noSigned-off-by Jeremy Sowden <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>---
Hi Jeremy et al.I'm revisiting this one, it's basically your patch with a few mangling.
Quoted 8 lines
I wonder if it's probably a good idea to introduce a long version mode. I have seen other tools providing more verbose information about all build information.
The idea would be to leave -v/--version as it is, and introduce -V which would be more verbose.
Thanks.
Fine by me. Btw, I notice that OPTSTRING contains a couple of duplicates. I've attached a patch to remove them. It applies on top of this one.
Quoted 90 lines
src/Makefile.am | 3 +++ src/main.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-)src/Makefile.am +3
-0@@ -13,6 +13,9 @@ endif if BUILD_XTABLES AM_CPPFLAGS += ${XTABLES_CFLAGS} endif +if BUILD_MINIGMP +AM_CPPFLAGS += -DHAVE_MINIGMP +endif AM_CFLAGS = -Wall \ -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \src/main.c +31
-2@@ -27,6 +27,7 @@ static struct nft_ctx *nft;enum opt_vals {OPT_HELP ='h' ,OPT_VERSION ='v' , +OPT_VERSION_LONG ='V' ,OPT_CHECK ='c' ,OPT_FILE ='f' ,OPT_INTERACTIVE ='i' ,@@ -46,7 +47,7 @@ enum opt_vals {OPT_TERSE ='t' , OPT_INVALID = '?', }; -#define OPTSTRING "+hvd:cf:iI:jvnsNaeSupypTt" +#define OPTSTRING "+hvVd:cf:iI:jvnsNaeSupypTt"static const struct option options[] = { {@@ -141,6 +142,7 @@ static void show_help(const char *name)"Options:\n" " -h, --help Show this help\n" " -v, --version Show version information\n" +" -V Show extended version information\n" "\n" " -c, --check Check commands validity without actually applying the changes.\n" " -f, --file <filename> Read input from <filename>\n" @@ -164,6 +166,31 @@ static void show_help(const char *name) name, DEFAULT_INCLUDE_PATH); } +static void show_version (void ) +{ +const char *cli, *minigmp; + +#if defined(HAVE_LIBREADLINE ) + cli ="readline" ; +#elif defined(HAVE_LIBLINENOISE ) + cli ="linenoise" ; +#else + cli ="no" ; +#endif + +#if defined(HAVE_MINIGMP ) + minigmp ="yes" ; +#else + minigmp ="no" ; +#endif + +printf ("%s v%s (%s)\n" +" cli: %s\n" +" minigmp: %s\n" , +PACKAGE_NAME ,PACKAGE_VERSION ,RELEASE_NAME , + cli, minigmp); +} + static const struct { const char *name; enum nft_debug_level level;@@ -272,6 +299,9 @@ int main(int argc, char * const *argv)printf ("%s v%s (%s)\n" ,PACKAGE_NAME ,PACKAGE_VERSION ,RELEASE_NAME );exit (EXIT_SUCCESS ); +case OPT_VERSION_LONG : +show_version (); +exit (EXIT_SUCCESS );case OPT_CHECK :nft_ctx_set_dry_run (nft, true);break ; --
Quoted 1 line
2.11.0
J.
From a0ddf69b9ef82ccc3f3c3174f960da3d58201e31 Mon Sep 17 00:00:00 2001
From: Jeremy Sowden <[email protected]>
Date: Wed, 4 Mar 2020 08:40:15 +0000
Subject: [PATCH] main: remove duplicates from option string.
The string of options passed to getopt_long(3) contains duplicates. Update it to match the opt_vals enum which immediately precedes it.
--- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/main.c +1 -1
@@ -47,7 +47,7 @@ enum opt_vals {OPT_TERSE ='t' , OPT_INVALID = '?', }; -#define OPTSTRING "+hvVd:cf:iI:jvnsNaeSupypTt" +#define OPTSTRING "+hvVcf:iI:jnsNSd:aeuypTt"static const struct option options[] = { {
Signature · 1 line
2.25.1
Pablo Neira Ayuso
maintainerQuoted 23 lines · Jeremy Sowden
Quoted 22 lines · Pablo Neira Ayuso
From: Jeremy Sowden <[email protected]>
In addition to the package-version and release-name, output the CLI implementation (if any) and whether mini-gmp was used, e.g.:
$ ./src/nft -V nftables v0.9.3 (Topsy) cli: linenoise minigmp: noSigned-off-by Jeremy Sowden <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>---
Hi Jeremy et al.I'm revisiting this one, it's basically your patch with a few mangling.
I wonder if it's probably a good idea to introduce a long version mode. I have seen other tools providing more verbose information about all build information.
Quoted 8 lines
Quoted 4 lines
The idea would be to leave -v/--version as it is, and introduce -V which would be more verbose.
Thanks.
Fine by me. Btw, I notice that OPTSTRING contains a couple of duplicates. I've attached a patch to remove them. It applies on top of this one.
Thanks, I have applied these two patches.