Extend scanner.l to deal with CRLF, otherwise -f fails to load:
# file test.nft
test.nft: ASCII text, with CRLF, LF line terminators
# nft -f test.nft
test.nft:1:13-13: Error: syntax error, unexpected junk
table ip x {
^
Add test to cover this usecase.
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
---
src/scanner.l | 4 +++-
tests/shell/testcases/nft-f/crlf_0 | 17 +++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100755 tests/shell/testcases/nft-f/crlf_0
diff --git a/src/scanner.l b/src/scanner.l
index e72a427aab48..358fba495759 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -113,7 +113,9 @@ extern void yyset_column(int, yyscan_t);
space [ ]
tab \t
-newline \n
+newline_lf \n
+newline_crlf \r\n
+newline ({newline_lf}|{newline_crlf})
digit [0-9]
hexdigit [0-9a-fA-F]
decstring {digit}+
diff --git a/tests/shell/testcases/nft-f/crlf_0 b/tests/shell/testcases/nft-f/crlf_0
new file mode 100755
index 000000000000..7ba785c8656a
--- /dev/null
+++ b/tests/shell/testcases/nft-f/crlf_0
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+RULESET="table ip foo {\r\n\tchain ber {\r\n\t}\r\n}"
+
+tmpfile=$(mktemp)
+if [ ! -w $tmpfile ] ; then
+ echo "Failed to create tmp file" >&2
+ exit 0
+fi
+
+trap "rm -rf $tmpfile" EXIT # cleanup if aborted
+
+echo -e "$RULESET" > $tmpfile
+
+$NFT -f "$tmpfile"
--
2.30.2
