diff options
| author | Phil Sutter <phil@nwl.cc> | 2020-05-06 14:39:52 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2020-05-11 14:28:29 +0200 |
| commit | d4409d449c10faa3917a9c9624ba90ac881f89d1 (patch) | |
| tree | f53522e1e008a65466a04307378c771d0f527088 /iptables/xtables-arp.c | |
| parent | b199aca80da5741add50cce244492cc005230b66 (diff) | |
nft: Don't exit early after printing help texts
Follow regular code path after handling --help option to gracefully
deinit and free stuff.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/xtables-arp.c')
| -rw-r--r-- | iptables/xtables-arp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index e64938fb..8632774d 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -235,7 +235,7 @@ exit_tryhelp(int status) } static void -exit_printhelp(void) +printhelp(void) { struct xtables_target *t = NULL; int i; @@ -325,7 +325,6 @@ exit_printhelp(void) printf("\n"); t->help(); } - exit(0); } static char @@ -666,7 +665,8 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, if (!optarg) optarg = argv[optind]; - exit_printhelp(); + printhelp(); + command = CMD_NONE; break; case 's': check_inverse(optarg, &invert, &optind, argc); @@ -881,8 +881,6 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, if (optind < argc) xtables_error(PARAMETER_PROBLEM, "unknown arguments found on commandline"); - if (!command) - xtables_error(PARAMETER_PROBLEM, "no command specified"); if (invert) xtables_error(PARAMETER_PROBLEM, "nothing appropriate following !"); @@ -1009,6 +1007,8 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, xtables_error(PARAMETER_PROBLEM, "Wrong policy `%s'\n", policy); break; + case CMD_NONE: + break; default: /* We should never reach this... */ exit_tryhelp(2); |