From 32312e0252cf41b07285c6b2facdad91533585da Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 25 Jun 2009 20:27:32 +0000 Subject: [PATCH] vis compat stuff. --- cmd-server-info.c | 3 +- compat.h | 8 +- compat/vis.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++ compat/vis.h | 85 ++++++++++++++++++ configure | 29 +++--- screen.c | 3 +- 6 files changed, 329 insertions(+), 19 deletions(-) create mode 100644 compat/vis.c create mode 100644 compat/vis.h diff --git a/cmd-server-info.c b/cmd-server-info.c index 678800c1..5076fb02 100644 --- a/cmd-server-info.c +++ b/cmd-server-info.c @@ -1,4 +1,4 @@ -/* $Id: cmd-server-info.c,v 1.19 2009-06-25 16:21:32 nicm Exp $ */ +/* $Id: cmd-server-info.c,v 1.20 2009-06-25 20:27:31 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -23,7 +23,6 @@ #include #include #include -#include #include "tmux.h" diff --git a/compat.h b/compat.h index 7c3691e0..0329151f 100644 --- a/compat.h +++ b/compat.h @@ -1,4 +1,4 @@ -/* $Id: compat.h,v 1.2 2009-06-25 17:02:59 nicm Exp $ */ +/* $Id: compat.h,v 1.3 2009-06-25 20:27:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -113,6 +113,12 @@ #endif #endif +#ifdef HAVE_VIS +#include +#else +#include "compat/vis.h" +#endif + #ifndef HAVE_STRTONUM /* strtonum.c */ long long strtonum(const char *, long long, long long, const char **); diff --git a/compat/vis.c b/compat/vis.c new file mode 100644 index 00000000..5aca58cc --- /dev/null +++ b/compat/vis.c @@ -0,0 +1,220 @@ +/* $OpenBSD: vis.c,v 1.19 2005/09/01 17:15:49 millert Exp $ */ +/*- + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. 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. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include + +#include "tmux.h" + +#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#define isvisible(c) \ + (((u_int)(c) <= UCHAR_MAX && isascii((u_char)(c)) && \ + (((c) != '*' && (c) != '?' && (c) != '[' && (c) != '#') || \ + (flag & VIS_GLOB) == 0) && isgraph((u_char)(c))) || \ + ((flag & VIS_SP) == 0 && (c) == ' ') || \ + ((flag & VIS_TAB) == 0 && (c) == '\t') || \ + ((flag & VIS_NL) == 0 && (c) == '\n') || \ + ((flag & VIS_SAFE) && ((c) == '\b' || \ + (c) == '\007' || (c) == '\r' || \ + isgraph((u_char)(c))))) + +/* + * vis - visually encode characters + */ +char * +vis(char *dst, int c, int flag, int nextc) +{ + if (isvisible(c)) { + *dst++ = c; + if (c == '\\' && (flag & VIS_NOSLASH) == 0) + *dst++ = '\\'; + *dst = '\0'; + return (dst); + } + + if (flag & VIS_CSTYLE) { + switch(c) { + case '\n': + *dst++ = '\\'; + *dst++ = 'n'; + goto done; + case '\r': + *dst++ = '\\'; + *dst++ = 'r'; + goto done; + case '\b': + *dst++ = '\\'; + *dst++ = 'b'; + goto done; + case '\a': + *dst++ = '\\'; + *dst++ = 'a'; + goto done; + case '\v': + *dst++ = '\\'; + *dst++ = 'v'; + goto done; + case '\t': + *dst++ = '\\'; + *dst++ = 't'; + goto done; + case '\f': + *dst++ = '\\'; + *dst++ = 'f'; + goto done; + case ' ': + *dst++ = '\\'; + *dst++ = 's'; + goto done; + case '\0': + *dst++ = '\\'; + *dst++ = '0'; + if (isoctal(nextc)) { + *dst++ = '0'; + *dst++ = '0'; + } + goto done; + } + } + if (((c & 0177) == ' ') || (flag & VIS_OCTAL) || + ((flag & VIS_GLOB) && (c == '*' || c == '?' || c == '[' || c == '#'))) { + *dst++ = '\\'; + *dst++ = ((u_char)c >> 6 & 07) + '0'; + *dst++ = ((u_char)c >> 3 & 07) + '0'; + *dst++ = ((u_char)c & 07) + '0'; + goto done; + } + if ((flag & VIS_NOSLASH) == 0) + *dst++ = '\\'; + if (c & 0200) { + c &= 0177; + *dst++ = 'M'; + } + if (iscntrl((u_char)c)) { + *dst++ = '^'; + if (c == 0177) + *dst++ = '?'; + else + *dst++ = c + '@'; + } else { + *dst++ = '-'; + *dst++ = c; + } +done: + *dst = '\0'; + return (dst); +} + +/* + * strvis, strnvis, strvisx - visually encode characters from src into dst + * + * Dst must be 4 times the size of src to account for possible + * expansion. The length of dst, not including the trailing NULL, + * is returned. + * + * Strnvis will write no more than siz-1 bytes (and will NULL terminate). + * The number of bytes needed to fully encode the string is returned. + * + * Strvisx encodes exactly len bytes from src into dst. + * This is useful for encoding a block of data. + */ +int +strvis(char *dst, const char *src, int flag) +{ + char c; + char *start; + + for (start = dst; (c = *src);) + dst = vis(dst, c, flag, *++src); + *dst = '\0'; + return (dst - start); +} + +int +strnvis(char *dst, const char *src, size_t siz, int flag) +{ + char *start, *end; + char tbuf[5]; + int c, i; + + i = 0; + for (start = dst, end = start + siz - 1; (c = *src) && dst < end; ) { + if (isvisible(c)) { + i = 1; + *dst++ = c; + if (c == '\\' && (flag & VIS_NOSLASH) == 0) { + /* need space for the extra '\\' */ + if (dst < end) + *dst++ = '\\'; + else { + dst--; + i = 2; + break; + } + } + src++; + } else { + i = vis(tbuf, c, flag, *++src) - tbuf; + if (dst + i <= end) { + memcpy(dst, tbuf, i); + dst += i; + } else { + src--; + break; + } + } + } + if (siz > 0) + *dst = '\0'; + if (dst + i > end) { + /* adjust return value for truncation */ + while ((c = *src)) + dst += vis(tbuf, c, flag, *++src) - tbuf; + } + return (dst - start); +} + +int +strvisx(char *dst, const char *src, size_t len, int flag) +{ + char c; + char *start; + + for (start = dst; len > 1; len--) { + c = *src; + dst = vis(dst, c, flag, *++src); + } + if (len) + dst = vis(dst, *src, flag, '\0'); + *dst = '\0'; + return (dst - start); +} diff --git a/compat/vis.h b/compat/vis.h new file mode 100644 index 00000000..6ac66532 --- /dev/null +++ b/compat/vis.h @@ -0,0 +1,85 @@ +/* $Id: vis.h,v 1.4 2009-06-25 20:27:32 nicm 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 $ */ + +/*- + * Copyright (c) 1990 The Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. 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. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)vis.h 5.9 (Berkeley) 4/3/91 + */ + +#ifndef _VIS_H_ +#define _VIS_H_ + +/* + * to select alternate encoding format + */ +#define VIS_OCTAL 0x01 /* use octal \ddd format */ +#define VIS_CSTYLE 0x02 /* use \[nrft0..] where appropriate */ + +/* + * to alter set of characters encoded (default is to encode all + * non-graphic except space, tab, and newline). + */ +#define VIS_SP 0x04 /* also encode space */ +#define VIS_TAB 0x08 /* also encode tab */ +#define VIS_NL 0x10 /* also encode newline */ +#define VIS_WHITE (VIS_SP | VIS_TAB | VIS_NL) +#define VIS_SAFE 0x20 /* only encode "unsafe" characters */ + +/* + * other + */ +#define VIS_NOSLASH 0x40 /* inhibit printing '\' */ +#define VIS_GLOB 0x100 /* encode glob(3) magics and '#' */ + +/* + * unvis return codes + */ +#define UNVIS_VALID 1 /* character valid */ +#define UNVIS_VALIDPUSH 2 /* character valid, push back passed char */ +#define UNVIS_NOCHAR 3 /* valid sequence, no character produced */ +#define UNVIS_SYNBAD -1 /* unrecognized escape sequence */ +#define UNVIS_ERROR -2 /* decoder in unknown state (unrecoverable) */ + +/* + * unvis flags + */ +#define UNVIS_END 1 /* no more characters */ + +#include + +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 strunvis(char *, const char *); +int unvis(char *, char, int *, int); +ssize_t strnunvis(char *, const char *, size_t); + +#endif /* !_VIS_H_ */ diff --git a/configure b/configure index 04536557..3031d2bd 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: configure,v 1.14 2009-06-25 17:02:59 nicm Exp $ +# $Id: configure,v 1.15 2009-06-25 20:27:31 nicm Exp $ TMUX_PLATFORM=${TMUX_PLATFORM:-`uname -s`} @@ -28,7 +28,7 @@ cat <>$CONFIG_H #undef HAVE_STRTONUM #undef HAVE_TREE_H #undef HAVE_UTIL_H -#undef HAVE_VSYSLOG +#undef HAVE_VIS EOF case $TMUX_PLATFORM in @@ -51,7 +51,7 @@ case $TMUX_PLATFORM in #define HAVE_STRTONUM #define HAVE_TREE_H #define HAVE_UTIL_H -#define HAVE_VSYSLOG +#define HAVE_VIS EOF cat <>$CONFIG_MK SRCS+= osdep-openbsd.c @@ -68,7 +68,6 @@ EOF #define HAVE_POLL #define HAVE_PROGNAME #define HAVE_PTY_H -#define HAVE_VSYSLOG EOF cat <>$CONFIG_MK SRCS+= osdep-linux.c \ @@ -76,7 +75,8 @@ SRCS+= osdep-linux.c \ compat/strlcat.c \ compat/strlcpy.c \ compat/strtonum.c \ - compat/getopt.c + compat/getopt.c \ + compat/vis.c CFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE LIBS+= -lcrypt -lutil EOF @@ -97,7 +97,8 @@ SRCS+= osdep-unknown.c \ compat/strlcpy.c \ compat/strtonum.c \ compat/fgetln.c \ - compat/getopt.c + compat/getopt.c \ + compat/vis.c EOF ;; # ------------------------------------------------------------------------------ @@ -107,7 +108,6 @@ EOF #define HAVE_POLL #define HAVE_STRLCAT #define HAVE_STRLCPY -#define HAVE_VSYSLOG EOF cat <>$CONFIG_MK CPPFLAGS+= -I/usr/local/include/ncurses \ @@ -123,7 +123,8 @@ SRCS+= osdep-unknown.c \ compat/fgetln.c \ compat/forkpty-sunos.c \ compat/getopt.c \ - compat/strtonum.c + compat/strtonum.c \ + compat/vis.c EOF ;; # ------------------------------------------------------------------------------ @@ -139,12 +140,12 @@ EOF #define HAVE_STRLCAT #define HAVE_STRLCPY #define HAVE_UTIL_H -#define HAVE_VSYSLOG EOF cat <>$CONFIG_MK SRCS+= osdep-darwin.c \ compat/bsd-poll.c \ - compat/strtonum.c + compat/strtonum.c \ + compat/vis.c EOF ;; # ------------------------------------------------------------------------------ @@ -163,10 +164,10 @@ EOF #define HAVE_STRLCAT #define HAVE_STRLCPY #define HAVE_STRTONUM -#define HAVE_VSYSLOG EOF cat <>$CONFIG_MK -SRCS+= osdep-freebsd.c +SRCS+= osdep-freebsd.c \ + compat/vis.c LIBS+= -lcrypt -lutil EOF ;; @@ -185,11 +186,11 @@ EOF #define HAVE_STRLCAT #define HAVE_STRLCPY #define HAVE_UTIL_H -#define HAVE_VSYSLOG EOF cat <>$CONFIG_MK SRCS+= osdep-netbsd.c \ - compat/strtonum.c + compat/strtonum.c \ + compat/vis.c LIBS+= -lcrypt -lutil CPPFLAGS+= -I/usr/pkg/include LDFLAGS+= -L/usr/pkg/lib diff --git a/screen.c b/screen.c index e9273d48..2a3bd181 100644 --- a/screen.c +++ b/screen.c @@ -1,4 +1,4 @@ -/* $Id: screen.c,v 1.87 2009-06-25 16:21:32 nicm Exp $ */ +/* $Id: screen.c,v 1.88 2009-06-25 20:27:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -20,7 +20,6 @@ #include #include -#include #include "tmux.h"