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/libxt_CT.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/libxt_CT.c')
| -rw-r--r-- | extensions/libxt_CT.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/extensions/libxt_CT.c b/extensions/libxt_CT.c index 682dd831..38ee17b1 100644 --- a/extensions/libxt_CT.c +++ b/extensions/libxt_CT.c @@ -87,14 +87,13 @@ static void ct_print_events(const char *pfx, const struct event_tbl *tbl, const char *sep = ""; unsigned int i; - printf("%s ", pfx); + printf(" %s ", pfx); for (i = 0; i < size; i++) { if (mask & (1 << tbl[i].event)) { printf("%s%s", sep, tbl[i].name); sep = ","; } } - printf(" "); } static int ct_parse(int c, char **argv, int invert, unsigned int *flags, @@ -138,11 +137,11 @@ static void ct_print(const void *ip, const struct xt_entry_target *target, int n const struct xt_ct_target_info *info = (const struct xt_ct_target_info *)target->data; - printf("CT "); + printf(" CT"); if (info->flags & XT_CT_NOTRACK) - printf("notrack "); + printf(" notrack"); if (info->helper[0]) - printf("helper %s ", info->helper); + printf(" helper %s", info->helper); if (info->ct_events) ct_print_events("ctevents", ct_event_tbl, ARRAY_SIZE(ct_event_tbl), info->ct_events); @@ -159,9 +158,9 @@ static void ct_save(const void *ip, const struct xt_entry_target *target) (const struct xt_ct_target_info *)target->data; if (info->flags & XT_CT_NOTRACK) - printf("--notrack "); + printf(" --notrack"); if (info->helper[0]) - printf("--helper %s ", info->helper); + printf(" --helper %s", info->helper); if (info->ct_events) ct_print_events("--ctevents", ct_event_tbl, ARRAY_SIZE(ct_event_tbl), info->ct_events); @@ -169,7 +168,7 @@ static void ct_save(const void *ip, const struct xt_entry_target *target) ct_print_events("--expevents", exp_event_tbl, ARRAY_SIZE(exp_event_tbl), info->exp_events); if (info->zone) - printf("--zone %u ", info->zone); + printf(" --zone %u", info->zone); } static struct xtables_target ct_target = { |