- (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack

[openssh.git] / openbsd-compat / vis.h

diff --git a/openbsd-compat/vis.h b/openbsd-compat/vis.h
index 5df6f3694fce69790c7a01998bb0d75d79c0e10a..3898a9e70ba4f494d2250329ee29ef4336e970bd 100644 (file)
--- a/openbsd-compat/vis.h
+++ b/openbsd-compat/vis.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: vis.h,v 1.5 2002/02/16 21:27:17 millert Exp $ */
+/*     $OpenBSD: vis.h,v 1.11 2005/08/09 19:38:31 millert Exp $        */
 /*     $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $      */
 
 /*-
@@ -13,11 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -35,7 +31,10 @@
  *
  *     @(#)vis.h       5.9 (Berkeley) 4/3/91
  */
-#include "config.h"
+
+/* OPENBSD ORIGINAL: include/vis.h */
+
+#include "includes.h"
 #if !defined(HAVE_STRNVIS)
 
 #ifndef _VIS_H_
@@ -64,6 +63,7 @@
  * other
  */
 #define        VIS_NOSLASH     0x40    /* inhibit printing '\' */
+#define        VIS_GLOB        0x100   /* encode glob(3) magics and '#' */
 
 /*
  * unvis return codes
@@ -81,10 +81,14 @@
 
 char   *vis(char *, int, int, int);
 int    strvis(char *, const char *, int);
-int    strnvis(char *, const char *, size_t, int);
-int    strvisx(char *, const char *, size_t, int);
+int    strnvis(char *, const char *, size_t, int)
+               __attribute__ ((__bounded__(__string__,1,3)));
+int    strvisx(char *, const char *, size_t, int)
+               __attribute__ ((__bounded__(__string__,1,3)));
 int    strunvis(char *, const char *);
 int    unvis(char *, char, int *, int);
+ssize_t strnunvis(char *, const char *, size_t)
+               __attribute__ ((__bounded__(__string__,1,3)));
 
 #endif /* !_VIS_H_ */