Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-05-23 17:02:25 +01:00
8 changed files with 67 additions and 43 deletions

7
utf8.c
View File

@ -18,6 +18,7 @@
#include <sys/types.h>
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
@ -207,7 +208,11 @@ utf8_strvis(char *dst, const char *src, size_t len, int flag)
/* Not a complete, valid UTF-8 character. */
src -= ud.have;
}
if (src < end - 1)
if (src[0] == '$' && src < end - 1) {
if (isalpha((u_char)src[1]) || src[1] == '_')
*dst++ = '\\';
*dst++ = '$';
} else if (src < end - 1)
dst = vis(dst, src[0], flag, src[1]);
else if (src < end)
dst = vis(dst, src[0], flag, '\0');