From 65b150ae382a8b5d1fc7f2465b3ac590c1601ce1 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 27 Sep 2021 16:59:49 +0200 Subject: xshared: Store optstring in xtables_globals Preparing for a common option parser, store the string of options for each family inside the respective xtables_globals object. The array of long option definitions sitting in there already indicates it's the right place. While being at it, drop '-m' support from arptables-nft. Signed-off-by: Phil Sutter --- iptables/xtables-arp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'iptables/xtables-arp.c') diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index 1d132bdf..a028ac34 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -100,6 +100,7 @@ extern void xtables_exit_error(enum xtables_exittype status, const char *msg, .. struct xtables_globals arptables_globals = { .option_offset = 0, .program_version = PACKAGE_VERSION, + .optstring = OPTSTRING_COMMON "R:S::" "h::l:nv" /* "m:" */, .orig_opts = original_opts, .exit_err = xtables_exit_error, .compat_rev = nft_compatible_revision, @@ -444,8 +445,7 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, opterr = 0; opts = xt_params->orig_opts; - while ((c = getopt_long(argc, argv, - "-A:D:R:I:L::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:l:i:vnt:m:c:", + while ((c = getopt_long(argc, argv, xt_params->optstring, opts, NULL)) != -1) { switch (c) { /* -- cgit v1.2.3