circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-04-26 10:01:16 +01:00
parent 3b833a0c01 d303e55258
commit 819ad1a007
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utf8.c
View File

@ -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: