diff options
author | Darren Tucker <dtucker@zip.com.au> | 2016-06-03 16:03:44 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-06-03 16:03:44 +1000 |
commit | ae9c0d4d5c581b3040d1f16b5c5f4b1cd1616743 (patch) | |
tree | 68c1f2de41a0a70cf85a7715a2da71eb278388a1 /openbsd-compat/vis.h | |
parent | e1d93705f8f48f519433d6ca9fc3d0abe92a1b77 (diff) |
Update vis.h and vis.c from OpenBSD.
This will be needed for the upcoming utf8 changes.
Diffstat (limited to 'openbsd-compat/vis.h')
-rw-r--r-- | openbsd-compat/vis.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/openbsd-compat/vis.h b/openbsd-compat/vis.h index d1286c99d..2cdfd364b 100644 --- a/openbsd-compat/vis.h +++ b/openbsd-compat/vis.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: vis.h,v 1.11 2005/08/09 19:38:31 millert Exp $ */ | 1 | /* $OpenBSD: vis.h,v 1.15 2015/07/20 01:52:27 millert Exp $ */ |
2 | /* $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $ */ | 2 | /* $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -58,6 +58,8 @@ | |||
58 | #define VIS_NL 0x10 /* also encode newline */ | 58 | #define VIS_NL 0x10 /* also encode newline */ |
59 | #define VIS_WHITE (VIS_SP | VIS_TAB | VIS_NL) | 59 | #define VIS_WHITE (VIS_SP | VIS_TAB | VIS_NL) |
60 | #define VIS_SAFE 0x20 /* only encode "unsafe" characters */ | 60 | #define VIS_SAFE 0x20 /* only encode "unsafe" characters */ |
61 | #define VIS_DQ 0x200 /* backslash-escape double quotes */ | ||
62 | #define VIS_ALL 0x400 /* encode all characters */ | ||
61 | 63 | ||
62 | /* | 64 | /* |
63 | * other | 65 | * other |
@@ -81,6 +83,7 @@ | |||
81 | 83 | ||
82 | char *vis(char *, int, int, int); | 84 | char *vis(char *, int, int, int); |
83 | int strvis(char *, const char *, int); | 85 | int strvis(char *, const char *, int); |
86 | int stravis(char **, const char *, int); | ||
84 | int strnvis(char *, const char *, size_t, int) | 87 | int strnvis(char *, const char *, size_t, int) |
85 | __attribute__ ((__bounded__(__string__,1,3))); | 88 | __attribute__ ((__bounded__(__string__,1,3))); |
86 | int strvisx(char *, const char *, size_t, int) | 89 | int strvisx(char *, const char *, size_t, int) |