column: EOF handling bug

For the last line of the file lenght of line should be determined
where the EOF is instead of new line. Old output was

$ printf "1 2\n3" | column -t
column: line too long
1 2

which this commit will change to

$ printf "1 2\n3" | column -t
1  2
3

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/text-utils/column.c b/text-utils/column.c
index e7cd334649e99bd60a84c0837de2f34c309e776a..c8c40664ade9a7e1732fa110f10c5397febd5f2d 100644 (file)
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -322,12 +322,13 @@ input(fp)
                for (p = buf; *p && iswspace(*p); ++p);
                if (!*p)
                        continue;
-               if (!(p = wcschr(p, '\n'))) {
+               if (!(p = wcschr(p, '\n')) && !feof(fp)) {
                        warnx(_("line too long"));
                        eval = 1;
                        continue;
                }
-               *p = '\0';
+               if (!feof(fp))
+                       *p = '\0';
                len = wcs_width(buf);   /* len = p - buf; */
                if (maxlength < len)
                        maxlength = len;