Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-05-23 21:02:30 +01:00
4 changed files with 8 additions and 5 deletions

4
utf8.c
View File

@ -209,7 +209,9 @@ utf8_strvis(char *dst, const char *src, size_t len, int flag)
src -= ud.have;
}
if (src[0] == '$' && src < end - 1) {
if (isalpha((u_char)src[1]) || src[1] == '_')
if (isalpha((u_char)src[1]) ||
src[1] == '_' ||
src[1] == '{')
*dst++ = '\\';
*dst++ = '$';
} else if (src < end - 1)