From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 4 May 2014 15:39:38 +0000 (+0100)
Subject: column: inform user when multibyte conversion error occurs
X-Git-Tag: v2.25-rc1~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acb5f9b56e14db9b684e245bfdf647522c9a57b4;p=thirdparty%2Futil-linux.git

column: inform user when multibyte conversion error occurs

The column(1) read input until conversion error, and used incomplete
input when outputing, that made at least me to wonder where the rest
disappeared without explanation.  IMHO it is better to fail immediately
rather than do only half of the task.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/tests/expected/column/invalid-multibyte b/tests/expected/column/invalid-multibyte
new file mode 100644
index 0000000000..7a8947266f
--- /dev/null
+++ b/tests/expected/column/invalid-multibyte
@@ -0,0 +1 @@
+column: read failed: Invalid or incomplete multibyte or wide character
diff --git a/tests/ts/column/invalid-multibyte b/tests/ts/column/invalid-multibyte
new file mode 100755
index 0000000000..9935a38337
--- /dev/null
+++ b/tests/ts/column/invalid-multibyte
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+#
+# Copyright (C) 2014 Sami Kerola <kerolasa@iki.fi>
+#
+# This file is part of util-linux.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+TS_TOPDIR="${0%/*}/../.."
+TS_DESC="invalid multibyte"
+
+. $TS_TOPDIR/functions.sh
+ts_init "$*"
+
+ts_check_test_command "$TS_CMD_COLUMN"
+
+cd $TS_OUTDIR
+
+printf "£\n" | LC_ALL=C $TS_CMD_COLUMN >> $TS_OUTPUT 2>&1
+
+ts_finalize
diff --git a/text-utils/column.c b/text-utils/column.c
index e34184e050..0ee5a9e894 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -376,7 +376,13 @@ static int input(FILE *fp, int *maxlength, wchar_t ***list, int *entries)
 	if (!local_list)
 		local_list = xcalloc(maxentry, sizeof(wchar_t *));
 
-	while (fgetws(buf, MAXLINELEN, fp)) {
+	while (1) {
+		if (fgetws(buf, MAXLINELEN, fp) == NULL) {
+			if (feof(fp))
+				break;
+			else
+				err(EXIT_FAILURE, _("read failed"));
+		}
 		for (p = buf; *p && iswspace(*p); ++p)
 			;
 		if (!*p)