diff options
| author | Florian Westphal <fw@strlen.de> | 2022-11-30 10:31:52 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2022-11-30 20:26:23 +0100 |
| commit | 83604e7f7327b6b3197f98b4e579a2b88a4c7356 (patch) | |
| tree | a6d3808c73531b172c112d590c8232417fdf9aeb /iptables/xtables-eb-translate.c | |
| parent | 71e159f62451736f217792a7f8cfa8ab00add4d0 (diff) | |
xlate: get rid of escape_quotes
Its not necessary to escape " characters, we can let xtables-translate
print the entire translation/command enclosed in '' chracters, i.e. nft
'add rule ...', this also takes care of [, { and other special characters
that some shells might parse otherwise (when copy-pasting translated output).
The escape_quotes struct member is retained to avoid an ABI breakage.
This breaks all xlate test cases, fixup in followup patches.
v3: no need to escape ', replace strcmp(x, "") with x[0] (Phil Sutter)
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/xtables-eb-translate.c')
| -rw-r--r-- | iptables/xtables-eb-translate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/iptables/xtables-eb-translate.c b/iptables/xtables-eb-translate.c index f09883cd..13b6b864 100644 --- a/iptables/xtables-eb-translate.c +++ b/iptables/xtables-eb-translate.c @@ -156,17 +156,17 @@ static int nft_rule_eb_xlate_add(struct nft_handle *h, const struct xt_cmd_parse const struct iptables_command_state *cs, bool append) { struct xt_xlate *xl = xt_xlate_alloc(10240); + const char *tick = cs->restore ? "" : "'"; int ret; - if (append) { - xt_xlate_add(xl, "add rule bridge %s %s ", p->table, p->chain); - } else { - xt_xlate_add(xl, "insert rule bridge %s %s ", p->table, p->chain); - } + xt_xlate_add(xl, "%s%s rule bridge %s %s ", tick, + append ? "add" : "insert", p->table, p->chain); ret = h->ops->xlate(cs, xl); if (ret) - printf("%s\n", xt_xlate_get(xl)); + printf("%s%s\n", xt_xlate_get(xl), tick); + else + printf("%s ", tick); xt_xlate_free(xl); return ret; |