ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chars: work around the wrong private-use-character widths on OpenBSD 

This fixes https://savannah.gnu.org/bugs/?60393.
master
Benno Schulenberg 2021-04-20 11:10:52 +02:00
parent 5efb6836a8
commit bb81932422
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/chars.c
View File

@ -250,6 +250,12 @@ bool is_zerowidth(const char *ch)
if (mbtowide(&wc, ch) < 0)
return FALSE;
#if defined(__OpenBSD__)
/* Work around an OpenBSD bug -- see https://sv.gnu.org/bugs/?60393. */
if (wc >= 0xF0000)
return FALSE;
#endif
return (wcwidth(wc) == 0);
}
#endif /* ENABLE_UTF8 */
@ -337,8 +343,11 @@ int advance_over(const char *string, size_t *column)
int width = wcwidth(wc);
#if defined(__OpenBSD__)
*column += (width < 0 || wc >= 0xF0000) ? 1 : width;
#else
*column += (width < 0) ? 1 : width;
#endif
return charlen;
}
}