diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-12-18 02:04:59 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2011-01-31 03:05:34 +0100 |
| commit | 73866357e4a7a0fdc1b293bf8863fee2bd56da9e (patch) | |
| tree | 1890725e5f327ba14ccf452ff9e5916954d7908f /extensions/libip6t_ipv6header.c | |
| parent | bb8be30857edd501e701c2f22db6c59bd6839c87 (diff) | |
iptables: do not print trailing whitespaces
Due to the use of printf("foobar "), iptables emits spaces at the
end-of-line, which looks odd to some users because it causes the
terminal to wrap even if there is seemingly nothing to print.
It may also have other points of annoyance, such as mailers
interpreting a trailing space as an indicator that the paragraph
continues when format=flowed is also on.
And git highlights trailing spaces in red, so let's avoid :)
Preexisting inconsistencies in outputting spaces in the right
spot are also addressed right away.
References: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429579
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions/libip6t_ipv6header.c')
| -rw-r--r-- | extensions/libip6t_ipv6header.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c index 7d2a97f8..da832e21 100644 --- a/extensions/libip6t_ipv6header.c +++ b/extensions/libip6t_ipv6header.c @@ -240,20 +240,19 @@ static void ipv6header_print(const void *ip, const struct xt_entry_match *match, int numeric) { const struct ip6t_ipv6header_info *info = (const struct ip6t_ipv6header_info *)match->data; - printf("ipv6header "); + printf(" ipv6header"); if (info->matchflags || info->invflags) { - printf("flags:%s", info->invflags ? "!" : ""); + printf(" flags:%s", info->invflags ? "!" : ""); if (numeric) - printf("0x%02X ", info->matchflags); + printf("0x%02X", info->matchflags); else { print_header(info->matchflags); - printf(" "); } } if (info->modeflag) - printf("soft "); + printf(" soft"); } static void ipv6header_save(const void *ip, const struct xt_entry_match *match) @@ -261,11 +260,10 @@ static void ipv6header_save(const void *ip, const struct xt_entry_match *match) const struct ip6t_ipv6header_info *info = (const struct ip6t_ipv6header_info *)match->data; - printf("%s--header ", info->invflags ? "! " : ""); + printf("%s --header ", info->invflags ? " !" : ""); print_header(info->matchflags); - printf(" "); if (info->modeflag) - printf("--soft "); + printf(" --soft"); } static struct xtables_match ipv6header_mt6_reg = { |