version 1.67, 2015/05/23 11:47:56 |
version 1.68, 2015/05/23 14:01:07 |
Line 97 static wchar_t *do_svis(wchar_t *, wint_ |
|
Line 97 static wchar_t *do_svis(wchar_t *, wint_ |
|
|
|
#undef BELL |
#undef BELL |
#define BELL L'\a' |
#define BELL L'\a' |
|
|
|
#if defined(__NetBSD__) && defined(_CTYPE_G) |
|
#define iscgraph(c) ((int)((_C_ctype_tab_ + 1)[(c)] & _CTYPE_G)) |
|
#else |
|
static int |
|
iscgraph(int c) { |
|
int rv; |
|
char *ol; |
|
|
|
ol = setlocale(LC_CTYPE, "C"); |
|
rv = isgraph(c); |
|
if (ol) |
|
setlocale(LC_CTYPE, ol); |
|
return rv; |
|
} |
|
#endif |
|
|
|
#define ISGRAPH(flags, c) \ |
|
(((flags) & VIS_NOLOCALE) ? iscgraph(c) : iswgraph(c)) |
|
|
#define iswoctal(c) (((u_char)(c)) >= L'0' && ((u_char)(c)) <= L'7') |
#define iswoctal(c) (((u_char)(c)) >= L'0' && ((u_char)(c)) <= L'7') |
#define iswwhite(c) (c == L' ' || c == L'\t' || c == L'\n') |
#define iswwhite(c) (c == L' ' || c == L'\t' || c == L'\n') |
Line 232 do_mbyte(wchar_t *dst, wint_t c, int fla |
|
Line 251 do_mbyte(wchar_t *dst, wint_t c, int fla |
|
case L'$': /* vis(1) -l */ |
case L'$': /* vis(1) -l */ |
break; |
break; |
default: |
default: |
if (iswgraph(c) && !iswoctal(c)) { |
if (ISGRAPH(flags, c) && !iswoctal(c)) { |
*dst++ = L'\\'; |
*dst++ = L'\\'; |
*dst++ = c; |
*dst++ = c; |
return dst; |
return dst; |
Line 284 do_svis(wchar_t *dst, wint_t c, int flag |
|
Line 303 do_svis(wchar_t *dst, wint_t c, int flag |
|
uint64_t bmsk, wmsk; |
uint64_t bmsk, wmsk; |
|
|
iswextra = wcschr(extra, c) != NULL; |
iswextra = wcschr(extra, c) != NULL; |
if (!iswextra && (iswgraph(c) || iswwhite(c) || |
if (!iswextra && (ISGRAPH(flags, c) || iswwhite(c) || |
((flags & VIS_SAFE) && iswsafe(c)))) { |
((flags & VIS_SAFE) && iswsafe(c)))) { |
*dst++ = c; |
*dst++ = c; |
return dst; |
return dst; |