summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArturo Borrero <arturo.borrero.glez@gmail.com>2016-03-23 13:51:33 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2016-03-29 13:19:24 +0200
commit89e3001be44aa2f25e51b139f044328230cbb098 (patch)
tree978bcc40823900d6632090ddf77d3d41bcc521a3
parent7fa2b0534745f53881ec74a0a73d4f870ea4b026 (diff)
rule: don't print trailing statement whitespace
This trailing whitespace is annoying when working with the textual output of nft. Before: table t { chain c { ct state new ^ } } After: table t { chain c { ct state new } } Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/rule.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rule.c b/src/rule.c
index 85987b9b..0ed77941 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -385,14 +385,15 @@ void rule_print(const struct rule *rule)
list_for_each_entry(stmt, &rule->stmts, list) {
stmt->ops->print(stmt);
- printf(" ");
+ if (!list_is_last(&stmt->list, &rule->stmts))
+ printf(" ");
}
if (rule->comment)
- printf("comment \"%s\" ", rule->comment);
+ printf(" comment \"%s\"", rule->comment);
if (handle_output > 0)
- printf("# handle %" PRIu64, rule->handle.handle);
+ printf(" # handle %" PRIu64, rule->handle.handle);
}
struct scope *scope_init(struct scope *scope, const struct scope *parent)