Merge branch 'getwc' of https://github.com/t-8ch/util-linux

* 'getwc' of https://github.com/t-8ch/util-linux:
  textutils: introduce and use fgetwc_or_err
  treewide: use fgetc() instead of getc()
  textutils: use fgetwc() instead of getwc()

16 files changed, 49 insertions, 18 deletions

diff --git a/include/Makemodule.am b/include/Makemodule.am
index 50a8546128..bdf87e2213 100644
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -26,6 +26,7 @@ dist_noinst_HEADERS += \
 	include/env.h \
 	include/exec_shell.h \
 	include/exitcodes.h \
+	include/fgetwc_or_err.h \
 	include/fileeq.h \
 	include/fileutils.h \
 	include/fuzz.h \
diff --git a/include/fgetwc_or_err.h b/include/fgetwc_or_err.h
new file mode 100644
index 0000000000..3cf9262834
--- /dev/null
+++ b/include/fgetwc_or_err.h
@@ -0,0 +1,23 @@
+#ifndef UTIL_LINUX_FGETWC_OR_ERR_H
+#define UTIL_LINUX_FGETWC_OR_ERR_H
+
+#include <stdio.h>
+#include <wchar.h>
+#include <errno.h>
+
+#include "widechar.h"
+#include "c.h"
+#include "nls.h"
+
+static inline wint_t fgetwc_or_err(FILE *stream) {
+	wint_t ret;
+
+	errno = 0;
+	ret = fgetwc(stream);
+	if (ret == WEOF && errno != 0)
+		err(EXIT_FAILURE, _("fgetwc() failed"));
+
+	return ret;
+}
+
+#endif /* _FGETWC_OR_ERR_H */
diff --git a/login-utils/islocal.c b/login-utils/islocal.c
index ab5c52ed58..7d5541fd10 100644
--- a/login-utils/islocal.c
+++ b/login-utils/islocal.c
@@ -39,7 +39,7 @@ static int is_local_in_file(const char *user, const char *filename)
 
 	match = 0u;
 	skip = 0;
-	while ((chin = getc(f)) != EOF) {
+	while ((chin = fgetc(f)) != EOF) {
 		if (skip) {
 			/* Looking for the start of the next line. */
 			if ('\n' == chin) {
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 0fc6f15144..ff5123dbf6 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -1843,9 +1843,9 @@ static int issuefile_read_stream(
 		ie->output = open_memstream(&ie->mem, &ie->mem_sz);
 	}
 
-	while ((c = getc(f)) != EOF) {
+	while ((c = fgetc(f)) != EOF) {
 		if (c == '\\')
-			output_special_char(ie, getc(f), op, tp, f);
+			output_special_char(ie, fgetc(f), op, tp, f);
 		else
 			putc(c, ie->output);
 	}
diff --git a/tests/expected/colcrt/regressions-crash1 b/tests/expected/colcrt/regressions-crash1
index 67a7b1c998..3b41a79524 100644
--- a/tests/expected/colcrt/regressions-crash1
+++ b/tests/expected/colcrt/regressions-crash1
@@ -1,2 +1 @@
- W U;    U;  D  f U;  D  f    D  f    >     @W  ]~   K- -  ----  -- -- -  -- -- ---- -- ---- --  -  --  --- --
-return value: 0
+return value: 1
diff --git a/tests/expected/colcrt/regressions-crash1.err b/tests/expected/colcrt/regressions-crash1.err
new file mode 100644
index 0000000000..5837df340c
--- /dev/null
+++ b/tests/expected/colcrt/regressions-crash1.err
@@ -0,0 +1 @@
+colcrt: fgetwc() failed: Invalid or incomplete multibyte or wide character
diff --git a/tests/expected/colcrt/regressions-crash2 b/tests/expected/colcrt/regressions-crash2
index 11ebf74a8f..58a43173eb 100644
--- a/tests/expected/colcrt/regressions-crash2
+++ b/tests/expected/colcrt/regressions-crash2
@@ -7,4 +7,4 @@ MN
 MN9|
 XYZ nT RnTUV|   NXP:w
    -
-MNOP.return value: 0
+return value: 1
diff --git a/tests/expected/colcrt/regressions-crash2.err b/tests/expected/colcrt/regressions-crash2.err
new file mode 100644
index 0000000000..5837df340c
--- /dev/null
+++ b/tests/expected/colcrt/regressions-crash2.err
@@ -0,0 +1 @@
+colcrt: fgetwc() failed: Invalid or incomplete multibyte or wide character
diff --git a/tests/expected/colcrt/regressions-hang1 b/tests/expected/colcrt/regressions-hang1
index cb16e46a34..78fb568e5b 100644
--- a/tests/expected/colcrt/regressions-hang1
+++ b/tests/expected/colcrt/regressions-hang1
@@ -1,3 +1,3 @@
 789:;<=>=>?IABUVNXYZ[ `abcdefgg !"#$%&'()*+,-./01234)*:,-./0123456789:;[=>?1234)*:,-./0123456789:;[=>?4456789:;<=>?IABUVN`abcdefg !"
                      -
-return value: 0
+return value: 1
diff --git a/tests/expected/colcrt/regressions-hang1.err b/tests/expected/colcrt/regressions-hang1.err
new file mode 100644
index 0000000000..5837df340c
--- /dev/null
+++ b/tests/expected/colcrt/regressions-hang1.err
@@ -0,0 +1 @@
+colcrt: fgetwc() failed: Invalid or incomplete multibyte or wide character
diff --git a/tests/ts/colcrt/regressions b/tests/ts/colcrt/regressions
index 7bbba658be..2bb846959a 100755
--- a/tests/ts/colcrt/regressions
+++ b/tests/ts/colcrt/regressions
@@ -28,6 +28,7 @@ check_input_file() {
 	ts_init_subtest ${1##*/}
 	timeout 2 env LC_ALL=C.UTF-8 $TS_CMD_COLCRT < $1 >> $TS_OUTPUT 2>> $TS_ERRLOG
 	echo "return value: $?" >> $TS_OUTPUT
+	sed -i -e 's/Illegal byte sequence/Invalid or incomplete multibyte or wide character/' $TS_ERRLOG
 	ts_finalize_subtest
 }
 
diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index a6da499763..4a1214cc80 100644
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -49,6 +49,7 @@
 #include "c.h"
 #include "widechar.h"
 #include "closestream.h"
+#include "fgetwc_or_err.h"
 
 /*
  * colcrt - replaces col for crts with new nroff esp. when using tbl.
@@ -164,7 +165,7 @@ static void colcrt(struct colcrt_control *ctl)
 			errno = 0;
 			old_pos = ftell(ctl->f);
 
-			while (getwc(ctl->f) != L'\n') {
+			while (fgetwc_or_err(ctl->f) != L'\n') {
 				long new_pos;
 
 				if (ferror(ctl->f) || feof(ctl->f))
@@ -179,10 +180,10 @@ static void colcrt(struct colcrt_control *ctl)
 			col = -1;
 			continue;
 		}
-		c = getwc(ctl->f);
+		c = fgetwc_or_err(ctl->f);
 		switch (c) {
 		case 033:	/* ESC */
-			c = getwc(ctl->f);
+			c = fgetwc_or_err(ctl->f);
 			if (c == L'8') {
 				col = rubchars(ctl, col, 1);
 				continue;
diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index 122564339f..363d732b62 100644
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -48,6 +48,7 @@
 #include "c.h"
 #include "widechar.h"
 #include "closestream.h"
+#include "fgetwc_or_err.h"
 
 /*
 COLRM removes unwanted columns from a file
@@ -81,7 +82,7 @@ static int process_input(unsigned long first, unsigned long last)
 	int padding;
 
 	for (;;) {
-		c = getwc(stdin);
+		c = fgetwc_or_err(stdin);
 		if (c == WEOF)
 			return 0;
 		if (c == '\t')
@@ -112,7 +113,7 @@ static int process_input(unsigned long first, unsigned long last)
 
 	/* Loop getting rid of characters */
 	while (!last || ct < last) {
-		c = getwc(stdin);
+		c = fgetwc_or_err(stdin);
 		if (c == WEOF)
 			return 0;
 		if (c == '\n') {
@@ -135,7 +136,7 @@ static int process_input(unsigned long first, unsigned long last)
 
 	/* Output last of the line */
 	for (;;) {
-		c = getwc(stdin);
+		c = fgetwc_or_err(stdin);
 		if (c == WEOF)
 			break;
 		if (c == '\n') {
diff --git a/text-utils/more.c b/text-utils/more.c
index 1badf67d55..4c22533185 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -379,7 +379,7 @@ static void more_fseek(struct more_control *ctl, off_t pos)
 
 static int more_getc(struct more_control *ctl)
 {
-	int ret = getc(ctl->current_file);
+	int ret = fgetc(ctl->current_file);
 	ctl->file_position = ftello(ctl->current_file);
 	return ret;
 }
diff --git a/text-utils/rev.c b/text-utils/rev.c
index 4b731890d8..fc7ac6203b 100644
--- a/text-utils/rev.c
+++ b/text-utils/rev.c
@@ -63,6 +63,7 @@
 #include "widechar.h"
 #include "c.h"
 #include "closestream.h"
+#include "fgetwc_or_err.h"
 
 static void sig_handler(int signo __attribute__ ((__unused__)))
 {
@@ -100,7 +101,7 @@ static size_t read_line(wchar_t sep, wchar_t *str, size_t n, FILE *stream)
 {
 	size_t r = 0;
 	while (r < n) {
-		wint_t c = fgetwc(stream);
+		wint_t c = fgetwc_or_err(stream);
 		if (c == WEOF)
 			break;
 		str[r++] = c;
diff --git a/text-utils/ul.c b/text-utils/ul.c
index 85fa86fe48..62bfcd7bf9 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -62,6 +62,7 @@
 #include "widechar.h"
 #include "c.h"
 #include "closestream.h"
+#include "fgetwc_or_err.h"
 
 #define	ESC	'\033'
 #define	SO	'\016'
@@ -439,7 +440,7 @@ static int handle_escape(struct ul_ctl *ctl, struct term_caps const *const tcs,
 {
 	wint_t c;
 
-	switch (c = getwc(f)) {
+	switch (c = fgetwc_or_err(f)) {
 	case HREV:
 		if (0 < ctl->half_position) {
 			ctl->mode &= ~SUBSCRIPT;
@@ -479,7 +480,7 @@ static void filter(struct ul_ctl *ctl, struct term_caps const *const tcs, FILE *
 	wint_t c;
 	int i, width;
 
-	while ((c = getwc(f)) != WEOF) {
+	while ((c = fgetwc_or_err(f)) != WEOF) {
 		switch (c) {
 		case '\b':
 			set_column(ctl, ctl->column && 0 < ctl->column ? ctl->column - 1 : 0);
@@ -498,7 +499,7 @@ static void filter(struct ul_ctl *ctl, struct term_caps const *const tcs, FILE *
 			continue;
 		case ESC:
 			if (handle_escape(ctl, tcs, f)) {
-				c = getwc(f);
+				c = fgetwc_or_err(f);
 				errx(EXIT_FAILURE,
 				     _("unknown escape sequence in input: %o, %o"), ESC, c);
 			}