From d303e552582e311aae9a246651dc3816775707b7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 26 Apr 2016 07:33:36 +0000
Subject: [PATCH] Log wcwidth() and mbtowc() failure to make it easier to debug
 a Unicode codepoint not appearing.

---
 utf8.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/utf8.c b/utf8.c
index 114f2b90..56281aa2 100644
--- a/utf8.c
+++ b/utf8.c
@@ -18,6 +18,7 @@
 
 #include <sys/types.h>
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <vis.h>
@@ -116,8 +117,10 @@ utf8_width(wchar_t wc)
 	int	width;
 
 	width = wcwidth(wc);
-	if (width < 0 || width > 0xff)
+	if (width < 0 || width > 0xff) {
+		log_debug("Unicode %04x, wcwidth() %d", wc, width);
 		return (-1);
+	}
 	return (width);
 }
 
@@ -127,6 +130,8 @@ utf8_combine(const struct utf8_data *ud, wchar_t *wc)
 {
 	switch (mbtowc(wc, ud->data, ud->size)) {
 	case -1:
+		log_debug("UTF-8 %.*s, mbtowc() %d", (int)ud->size, ud->data,
+		    errno);
 		mbtowc(NULL, NULL, MB_CUR_MAX);
 		return (UTF8_ERROR);
 	case 0: