shared: Fix EOF handling in freadline_wrapped

If a file ends with a backslash without a newline, freadline_wrapped
adds EOF to the actual string.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Link: https://github.com/kmod-project/kmod/pull/159
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>

diff --git a/shared/util.c b/shared/util.c
index b9da7c4e9a03c0fe27c2b6c42922ba75591d54d6..5102879fb77dff4028cb3bfa73b831631f319cd6 100644 (file)
--- a/shared/util.c
+++ b/shared/util.c
@@ -319,6 +319,8 @@ char *freadline_wrapped(FILE *fp, unsigned int *linenum)
                        if (ch == '\n') {
                                n++;
                                continue;
+                       } else if (ch == EOF) {
+                               continue;
                        }
                        /* else fall through */
 

diff --git a/testsuite/rootfs-pristine/test-util/freadline_wrapped-correct.txt b/testsuite/rootfs-pristine/test-util/freadline_wrapped-correct.txt
index 80c671be8d7355b389e043600a71fc342421f05b..8078899cfb9927cdeab258537584261e06c9a779 100644 (file)
--- a/testsuite/rootfs-pristine/test-util/freadline_wrapped-correct.txt
+++ b/testsuite/rootfs-pristine/test-util/freadline_wrapped-correct.txt
@@ -8,3 +8,5 @@ this line has exactly 256 chars to make fun with the implementation, so it must
 1
 this line is very large because it has word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word until it hits 2015 chars
 1
+wrapped without newline
+1

diff --git a/testsuite/rootfs-pristine/test-util/freadline_wrapped-input.txt b/testsuite/rootfs-pristine/test-util/freadline_wrapped-input.txt
index 1c81f915bf2677a882da3f17e9132cc6ae94a5c5..27aa1b1d86b13b20233934caf3bda039e849a257 100644 (file)
--- a/testsuite/rootfs-pristine/test-util/freadline_wrapped-input.txt
+++ b/testsuite/rootfs-pristine/test-util/freadline_wrapped-input.txt
@@ -6,3 +6,4 @@ lines \
 in a row
 this line has exactly 256 chars to make fun with the implementation, so it must have word after word after word after word after word after word after word after word after word after word after word after word after word after word until it hits 256 chars
 this line is very large because it has word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word after word until it hits 2015 chars
+wrapped without newline\
\ No newline at end of file