Merge branch 'obsd-master'

1 files changed, 6 insertions, 1 deletions

diff --git a/utf8.c b/utf8.c
index c0407576..54cea671 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 <wchar.h>
@@ -115,8 +116,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);
 }
 
@@ -126,6 +129,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: