From 6b0bb82b99a3d3f74e20dd4b8e57203f9fc7be69 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Tue, 29 May 2012 21:39:57 +0200 Subject: [PATCH] watch: fix to backporting error, and other wide character issues The commit 8967f0fca3ab53479071a01f1522a19517ecb9cd has an typo like error, which I must have done. The Bug-Debian 240989 did not have 12 but 128. Rest of the fixes are from Bug-Debian 675069 e.g. missing include added, and usage of iswprint(). Bug-Debian: http://bugs.debian.org/240989 Bug-Debian: http://bugs.debian.org/675069 Reported-by: "Dr. David Alan Gilbert" Signed-off-by: Sami Kerola --- watch.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/watch.c b/watch.c index 46498447..e4543082 100644 --- a/watch.c +++ b/watch.c @@ -53,6 +53,7 @@ #include #ifdef WITH_WATCH8BIT # include +# include # include #else # include @@ -438,8 +439,8 @@ int run_command(char *restrict command, char **restrict command_argv) c = carry; carry = WEOF; } - } while (c != WEOF && !isprint(c) - && c < 12 + } while (c != WEOF && !iswprint(c) + && c < 128 && wcwidth(c) == 0 && c != L'\n' && c != L'\t' -- 2.50.1