iptables: add --line-numbers short option
PATCH 1/1 iptables: add --line-numbers short option
Internally, -0 is used as a short option to represent --line-numbers. This causes confusion, however, when using --line-numbers with a command which does not support it. For instance:
# /usr/local/iptables/sbin/ip6tables -S --line-numbers
ip6tables v1.4.20: Illegal option `-0' with this commandFix this by enabling and documenting -0 as a short option for --line-numbers.
Signed-off-by Phil Oester <[email protected]>
iptables/ip6tables.c +2 -2
@@ -259,7 +259,7 @@ exit_printhelp(const struct xtables_rule_match *matches)" --table -t table table to manipulate (default: `filter')\n" " --verbose -v verbose mode\n" " --wait -w wait for the xtables lock\n" -" --line-numbers print line numbers when listing\n" +" --line-numbers -0 print line numbers when listing\n" " --exact -x expand numbers (display exact values)\n" /*"[!] --fragment -f match second or further fragments only\n"*/ " --modprobe=<command> try to insert modules using this command\n"
@@ -1332,7 +1332,7 @@ int do_command6(int argc, char *argv[], char **table, opts = xt_params->orig_opts;while ((cs.c =getopt_long (argc, argv, -"-:A:C:D:R:I:L::S::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:i:bvwnt:m:xc:g:46" , +"-:A:C:D:R:I:L::S::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:i:bvwnt:m:xc:g:046" , opts,NULL )) !=-1 ) {switch (cs.c) {/*
iptables/iptables.8.in +1 -1
@@ -381,7 +381,7 @@ instead of only the rounded number in K's (multiples of 1000) M's (multiples of 1000K) or G's (multiples of 1000M). This option is only relevant for the \fB\-L\fP command. .TP -\fB\-\-line\-numbers\fP +\fB\-0\fP, \fB\-\-line\-numbers\fP When listing rules, add line numbers to the beginning of each rule, corresponding to that rule's position in the chain. .TP
iptables/iptables.c +2 -2
@@ -253,7 +253,7 @@ exit_printhelp(const struct xtables_rule_match *matches)" --table -t table table to manipulate (default: `filter')\n" " --verbose -v verbose mode\n" " --wait -w wait for the xtables lock\n" -" --line-numbers print line numbers when listing\n" +" --line-numbers -0 print line numbers when listing\n" " --exact -x expand numbers (display exact values)\n" "[!] --fragment -f match second or further fragments only\n" " --modprobe=<command> try to insert modules using this command\n"
@@ -1328,7 +1328,7 @@ int do_command4(int argc, char *argv[], char **table, opts = xt_params->orig_opts;while ((cs.c =getopt_long (argc, argv, -"-:A:C:D:R:I:L::S::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:i:fbvwnt:m:xc:g:46" , +"-:A:C:D:R:I:L::S::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:i:fbvwnt:m:xc:g:046" , opts,NULL )) !=-1 ) {switch (cs.c) {/*