From 58b491f8cb5b4a0315037d0e1f61f8162a556e8a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 7 Feb 2011 03:45:26 +0100 Subject: iptables: fix error message for unknown options -From: iptables v1.4.10: option "-q" requires an argument +To: iptables v1.4.10: unknown option "-q" Signed-off-by: Jan Engelhardt --- iptables.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'iptables.c') diff --git a/iptables.c b/iptables.c index 6f5616ba..33fd8822 100644 --- a/iptables.c +++ b/iptables.c @@ -1316,15 +1316,12 @@ static void command_default(struct iptables_command_state *cs) return; } - if (cs->c == '?') { - if (optopt) - xtables_error(PARAMETER_PROBLEM, - "option \"%s\" requires an argument", - cs->argv[optind-1]); - else - xtables_error(PARAMETER_PROBLEM, - "unknown option \"%s\"", cs->argv[optind-1]); - } + if (cs->c == ':') + xtables_error(PARAMETER_PROBLEM, "option \"%s\" " + "requires an argument", cs->argv[optind-1]); + if (cs->c == '?') + xtables_error(PARAMETER_PROBLEM, "unknown option " + "\"%s\"", cs->argv[optind-1]); xtables_error(PARAMETER_PROBLEM, "Unknown arg \"%s\"", optarg); } @@ -1426,7 +1423,7 @@ int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle opts = xt_params->orig_opts; while ((cs.c = getopt_long(argc, argv, - "-A:D:R:I:L::S::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:i:fbvnt:m:xc:g:", + "-:A:D:R:I:L::S::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:i:fbvnt:m:xc:g:", opts, NULL)) != -1) { switch (cs.c) { /* -- cgit v1.2.3