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_mh.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_mh.c')
-rw-r--r-- | extensions/libip6t_mh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c index f41c4f43..460f9e47 100644 --- a/extensions/libip6t_mh.c +++ b/extensions/libip6t_mh.c @@ -170,6 +170,7 @@ static void print_types(uint8_t min, uint8_t max, int invert, int numeric) const char *inv = invert ? "!" : ""; if (min != 0 || max != 0xFF || invert) { + printf(" "); if (min == max) { printf("%s", inv); print_type(min, numeric); @@ -179,7 +180,6 @@ static void print_types(uint8_t min, uint8_t max, int invert, int numeric) printf(":"); print_type(max, numeric); } - printf(" "); } } @@ -188,12 +188,12 @@ static void mh_print(const void *ip, const struct xt_entry_match *match, { const struct ip6t_mh *mhinfo = (struct ip6t_mh *)match->data; - printf("mh "); + printf(" mh"); print_types(mhinfo->types[0], mhinfo->types[1], mhinfo->invflags & IP6T_MH_INV_TYPE, numeric); if (mhinfo->invflags & ~IP6T_MH_INV_MASK) - printf("Unknown invflags: 0x%X ", + printf(" Unknown invflags: 0x%X", mhinfo->invflags & ~IP6T_MH_INV_MASK); } @@ -205,12 +205,12 @@ static void mh_save(const void *ip, const struct xt_entry_match *match) return; if (mhinfo->invflags & IP6T_MH_INV_TYPE) - printf("! "); + printf(" !"); if (mhinfo->types[0] != mhinfo->types[1]) - printf("--mh-type %u:%u ", mhinfo->types[0], mhinfo->types[1]); + printf(" --mh-type %u:%u", mhinfo->types[0], mhinfo->types[1]); else - printf("--mh-type %u ", mhinfo->types[0]); + printf(" --mh-type %u", mhinfo->types[0]); } static const struct option mh_opts[] = { |