oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

sync with netbsd current

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23690 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-08-26 14:52:53 +00:00
parent a7ca391dc9
commit 7b9a83d1a0
2 changed files with 263 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

397
lib/roken/vis.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: vis.c,v 1.4 2003/08/07 09:15:32 agc Exp $ */ /* $NetBSD: vis.c,v 1.37 2008/07/25 22:29:23 dsl Exp $ */
/*- /*-
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@@ -30,7 +30,8 @@
*/ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999, 2005 The NetBSD Foundation, Inc.
* All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -40,28 +41,20 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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
* 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 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#if 1 #if 1
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@@ -71,16 +64,15 @@ RCSID("$Id$");
#ifndef _DIAGASSERT #ifndef _DIAGASSERT
#define _DIAGASSERT(X) #define _DIAGASSERT(X)
#endif #endif
#else #else /* heimdal */
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: vis.c,v 1.4 2003/08/07 09:15:32 agc Exp $"); __RCSID("$NetBSD: vis.c,v 1.37 2008/07/25 22:29:23 dsl Exp $");
#endif /* not lint */ #endif /* LIBC_SCCS and not lint */
#endif
#if 0
#include "namespace.h" #include "namespace.h"
#endif #endif /* heimdal */
#include <sys/types.h> #include <sys/types.h>
#include <assert.h> #include <assert.h>
@@ -89,6 +81,7 @@ __RCSID("$NetBSD: vis.c,v 1.4 2003/08/07 09:15:32 agc Exp $");
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <vis.h> #include <vis.h>
#include <stdlib.h>
#if 0 #if 0
#ifdef __weak_alias #ifdef __weak_alias
@@ -101,6 +94,14 @@ __weak_alias(vis,_vis)
#endif #endif
#endif #endif
#if !HAVE_VIS || !HAVE_SVIS
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
#include <string.h>
static char *do_svis(char *, int, int, int, const char *);
#undef BELL #undef BELL
#if defined(__STDC__) #if defined(__STDC__)
#define BELL '\a' #define BELL '\a'
@@ -108,10 +109,10 @@ __weak_alias(vis,_vis)
#define BELL '\007' #define BELL '\007'
#endif #endif
char ROKEN_LIB_FUNCTION char * ROKEN_LIB_FUNCTION
*rk_vis (char *, int, int, int); rk_vis (char *, int, int, int);
char ROKEN_LIB_FUNCTION char * ROKEN_LIB_FUNCTION
*rk_svis (char *, int, int, int, const char *); rk_svis (char *, int, int, int, const char *);
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strvis (char *, const char *, int); rk_strvis (char *, const char *, int);
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
@@ -125,22 +126,47 @@ int ROKEN_LIB_FUNCTION
#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') #define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
#define iswhite(c) (c == ' ' || c == '\t' || c == '\n') #define iswhite(c) (c == ' ' || c == '\t' || c == '\n')
#define issafe(c) (c == '\b' || c == BELL || c == '\r') #define issafe(c) (c == '\b' || c == BELL || c == '\r')
#define xtoa(c) "0123456789abcdef"[c]
#define MAXEXTRAS 5 #define MAXEXTRAS 5
#define MAKEEXTRALIST(flag, extra, orig_str) \
#define MAKEEXTRALIST(flag, extra) \
do { \ do { \
char *pextra = extra; \ const char *orig = orig_str; \
if (flag & VIS_SP) *pextra++ = ' '; \ const char *o = orig; \
if (flag & VIS_TAB) *pextra++ = '\t'; \ char *e; \
if (flag & VIS_NL) *pextra++ = '\n'; \ while (*o++) \
if ((flag & VIS_NOSLASH) == 0) *pextra++ = '\\'; \ continue; \
*pextra = '\0'; \ extra = malloc((size_t)((o - orig) + MAXEXTRAS)); \
if (!extra) break; \
for (o = orig, e = extra; (*e++ = *o++) != '\0';) \
continue; \
e--; \
if (flag & VIS_SP) *e++ = ' '; \
if (flag & VIS_TAB) *e++ = '\t'; \
if (flag & VIS_NL) *e++ = '\n'; \
if ((flag & VIS_NOSLASH) == 0) *e++ = '\\'; \
*e = '\0'; \
} while (/*CONSTCOND*/0) } while (/*CONSTCOND*/0)
/* /*
* This is SVIS, the central macro of vis. * This is do_hvis, for HTTP style (RFC 1808)
*/
static char *
do_hvis(char *dst, int c, int flag, int nextc, const char *extra)
{
if (!isascii(c) || !isalnum(c) || strchr("$-_.+!*'(),", c) != NULL) {
*dst++ = '%';
*dst++ = xtoa(((unsigned int)c >> 4) & 0xf);
*dst++ = xtoa((unsigned int)c & 0xf);
} else {
dst = do_svis(dst, c, flag, nextc, extra);
}
return dst;
}
/*
* This is do_vis, the central code of vis.
* dst: Pointer to the destination buffer * dst: Pointer to the destination buffer
* c: Character to encode * c: Character to encode
* flag: Flag word * flag: Flag word
@@ -148,90 +174,103 @@ do { \
* extra: Pointer to the list of extra characters to be * extra: Pointer to the list of extra characters to be
* backslash-protected. * backslash-protected.
*/ */
#define SVIS(dst, c, flag, nextc, extra) \ static char *
do { \ do_svis(char *dst, int c, int flag, int nextc, const char *extra)
int isextra, isc; \ {
isextra = strchr(extra, c) != NULL; \ int isextra;
if (!isextra && \ isextra = strchr(extra, c) != NULL;
isascii((unsigned char)c) && \ if (!isextra && isascii(c) && (isgraph(c) || iswhite(c) ||
(isgraph((unsigned char)c) || iswhite(c) || \ ((flag & VIS_SAFE) && issafe(c)))) {
((flag & VIS_SAFE) && issafe(c)))) { \ *dst++ = c;
*dst++ = c; \ return dst;
break; \ }
} \ if (flag & VIS_CSTYLE) {
isc = 0; \ switch (c) {
if (flag & VIS_CSTYLE) { \ case '\n':
switch (c) { \ *dst++ = '\\'; *dst++ = 'n';
case '\n': \ return dst;
isc = 1; *dst++ = '\\'; *dst++ = 'n'; \ case '\r':
break; \ *dst++ = '\\'; *dst++ = 'r';
case '\r': \ return dst;
isc = 1; *dst++ = '\\'; *dst++ = 'r'; \ case '\b':
break; \ *dst++ = '\\'; *dst++ = 'b';
case '\b': \ return dst;
isc = 1; *dst++ = '\\'; *dst++ = 'b'; \ case BELL:
break; \ *dst++ = '\\'; *dst++ = 'a';
case BELL: \ return dst;
isc = 1; *dst++ = '\\'; *dst++ = 'a'; \ case '\v':
break; \ *dst++ = '\\'; *dst++ = 'v';
case '\v': \ return dst;
isc = 1; *dst++ = '\\'; *dst++ = 'v'; \ case '\t':
break; \ *dst++ = '\\'; *dst++ = 't';
case '\t': \ return dst;
isc = 1; *dst++ = '\\'; *dst++ = 't'; \ case '\f':
break; \ *dst++ = '\\'; *dst++ = 'f';
case '\f': \ return dst;
isc = 1; *dst++ = '\\'; *dst++ = 'f'; \ case ' ':
break; \ *dst++ = '\\'; *dst++ = 's';
case ' ': \ return dst;
isc = 1; *dst++ = '\\'; *dst++ = 's'; \ case '\0':
break; \ *dst++ = '\\'; *dst++ = '0';
case '\0': \ if (isoctal(nextc)) {
isc = 1; *dst++ = '\\'; *dst++ = '0'; \ *dst++ = '0';
if (isoctal(nextc)) { \ *dst++ = '0';
*dst++ = '0'; \ }
*dst++ = '0'; \ return dst;
} \ default:
} \ if (isgraph(c)) {
} \ *dst++ = '\\'; *dst++ = c;
if (isc) break; \ return dst;
if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) { \ }
*dst++ = '\\'; \ }
*dst++ = (u_char)(((unsigned)(u_char)c >> 6) & 03) + '0'; \ }
*dst++ = (u_char)(((unsigned)(u_char)c >> 3) & 07) + '0'; \ if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) {
*dst++ = (c & 07) + '0'; \ *dst++ = '\\';
} else { \ *dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + '0';
if ((flag & VIS_NOSLASH) == 0) *dst++ = '\\'; \ *dst++ = (u_char)(((u_int32_t)(u_char)c >> 3) & 07) + '0';
if (c & 0200) { \ *dst++ = (c & 07) + '0';
c &= 0177; *dst++ = 'M'; \ } else {
} \ if ((flag & VIS_NOSLASH) == 0) *dst++ = '\\';
if (iscntrl((unsigned char)c)) { \ if (c & 0200) {
*dst++ = '^'; \ c &= 0177; *dst++ = 'M';
if (c == 0177) \ }
*dst++ = '?'; \ if (iscntrl(c)) {
else \ *dst++ = '^';
*dst++ = c + '@'; \ if (c == 0177)
} else { \ *dst++ = '?';
*dst++ = '-'; *dst++ = c; \ else
} \ *dst++ = c + '@';
} \ } else {
} while (/*CONSTCOND*/0) *dst++ = '-'; *dst++ = c;
}
}
return dst;
}
/* /*
* svis - visually encode characters, also encoding the characters * svis - visually encode characters, also encoding the characters
* pointed to by `extra' * pointed to by `extra'
*/ */
char * ROKEN_LIB_FUNCTION char * ROKEN_LIB_FUNCTION
rk_svis(char *dst, int c, int flag, int nextc, const char *extra) rk_svis(char *dst, int c, int flag, int nextc, const char *extra)
{ {
char *nextra = NULL;
_DIAGASSERT(dst != NULL); _DIAGASSERT(dst != NULL);
_DIAGASSERT(extra != NULL); _DIAGASSERT(extra != NULL);
MAKEEXTRALIST(flag, nextra, extra);
SVIS(dst, c, flag, nextc, extra); if (!nextra) {
*dst = '\0'; /* can't create nextra, return "" */
return dst;
}
if (flag & VIS_HTTPSTYLE)
dst = do_hvis(dst, c, flag, nextc, nextra);
else
dst = do_svis(dst, c, flag, nextc, nextra);
free(nextra);
*dst = '\0'; *dst = '\0';
return(dst); return dst;
} }
@@ -242,94 +281,144 @@ rk_svis(char *dst, int c, int flag, int nextc, const char *extra)
* be encoded, too. These functions are useful e. g. to * be encoded, too. These functions are useful e. g. to
* encode strings in such a way so that they are not interpreted * encode strings in such a way so that they are not interpreted
* by a shell. * by a shell.
* *
* Dst must be 4 times the size of src to account for possible * Dst must be 4 times the size of src to account for possible
* expansion. The length of dst, not including the trailing NULL, * expansion. The length of dst, not including the trailing NULL,
* is returned. * is returned.
* *
* Strsvisx encodes exactly len bytes from src into dst. * Strsvisx encodes exactly len bytes from src into dst.
* This is useful for encoding a block of data. * This is useful for encoding a block of data.
*/ */
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strsvis(char *dst, const char *src, int flag, const char *extra) rk_strsvis(char *dst, const char *csrc, int flag, const char *extra)
{ {
char c; int c;
char *start; char *start;
char *nextra = NULL;
const unsigned char *src = (const unsigned char *)csrc;
_DIAGASSERT(dst != NULL); _DIAGASSERT(dst != NULL);
_DIAGASSERT(src != NULL); _DIAGASSERT(src != NULL);
_DIAGASSERT(extra != NULL); _DIAGASSERT(extra != NULL);
MAKEEXTRALIST(flag, nextra, extra);
for (start = dst; (c = *src++) != '\0'; /* empty */) if (!nextra) {
SVIS(dst, c, flag, *src, extra); *dst = '\0'; /* can't create nextra, return "" */
*dst = '\0'; return 0;
return (dst - start);
}
int ROKEN_LIB_FUNCTION
rk_strsvisx(char *dst, const char *src, size_t len, int flag, const char *extra)
{
char c;
char *start;
_DIAGASSERT(dst != NULL);
_DIAGASSERT(src != NULL);
_DIAGASSERT(extra != NULL);
for (start = dst; len > 0; len--) {
c = *src++;
SVIS(dst, c, flag, len ? *src : '\0', extra);
} }
if (flag & VIS_HTTPSTYLE) {
for (start = dst; (c = *src++) != '\0'; /* empty */)
dst = do_hvis(dst, c, flag, *src, nextra);
} else {
for (start = dst; (c = *src++) != '\0'; /* empty */)
dst = do_svis(dst, c, flag, *src, nextra);
}
free(nextra);
*dst = '\0'; *dst = '\0';
return (dst - start); return (dst - start);
} }
int ROKEN_LIB_FUNCTION
rk_strsvisx(char *dst, const char *csrc, size_t len, int flag, const char *extra)
{
unsigned char c;
char *start;
char *nextra = NULL;
const unsigned char *src = (const unsigned char *)csrc;
_DIAGASSERT(dst != NULL);
_DIAGASSERT(src != NULL);
_DIAGASSERT(extra != NULL);
MAKEEXTRALIST(flag, nextra, extra);
if (! nextra) {
*dst = '\0'; /* can't create nextra, return "" */
return 0;
}
if (flag & VIS_HTTPSTYLE) {
for (start = dst; len > 0; len--) {
c = *src++;
dst = do_hvis(dst, c, flag, len ? *src : '\0', nextra);
}
} else {
for (start = dst; len > 0; len--) {
c = *src++;
dst = do_svis(dst, c, flag, len ? *src : '\0', nextra);
}
}
free(nextra);
*dst = '\0';
return (dst - start);
}
#endif
#if !HAVE_VIS
/* /*
* vis - visually encode characters * vis - visually encode characters
*/ */
char * ROKEN_LIB_FUNCTION char * ROKEN_LIB_FUNCTION
rk_vis(char *dst, int c, int flag, int nextc) rk_vis(char *dst, int c, int flag, int nextc)
{ {
char extra[MAXEXTRAS]; char *extra = NULL;
unsigned char uc = (unsigned char)c;
_DIAGASSERT(dst != NULL); _DIAGASSERT(dst != NULL);
MAKEEXTRALIST(flag, extra); MAKEEXTRALIST(flag, extra, "");
SVIS(dst, c, flag, nextc, extra); if (! extra) {
*dst = '\0'; /* can't create extra, return "" */
return dst;
}
if (flag & VIS_HTTPSTYLE)
dst = do_hvis(dst, uc, flag, nextc, extra);
else
dst = do_svis(dst, uc, flag, nextc, extra);
free(extra);
*dst = '\0'; *dst = '\0';
return (dst); return dst;
} }
/* /*
* strvis, strvisx - visually encode characters from src into dst * strvis, strvisx - visually encode characters from src into dst
* *
* Dst must be 4 times the size of src to account for possible * Dst must be 4 times the size of src to account for possible
* expansion. The length of dst, not including the trailing NULL, * expansion. The length of dst, not including the trailing NULL,
* is returned. * is returned.
* *
* Strvisx encodes exactly len bytes from src into dst. * Strvisx encodes exactly len bytes from src into dst.
* This is useful for encoding a block of data. * This is useful for encoding a block of data.
*/ */
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strvis(char *dst, const char *src, int flag) rk_strvis(char *dst, const char *src, int flag)
{ {
char extra[MAXEXTRAS]; char *extra = NULL;
int rv;
MAKEEXTRALIST(flag, extra); MAKEEXTRALIST(flag, extra, "");
return (rk_strsvis(dst, src, flag, extra)); if (!extra) {
*dst = '\0'; /* can't create extra, return "" */
return 0;
}
rv = strsvis(dst, src, flag, extra);
free(extra);
return rv;
} }
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strvisx(char *dst, const char *src, size_t len, int flag) rk_strvisx(char *dst, const char *src, size_t len, int flag)
{ {
char extra[MAXEXTRAS]; char *extra = NULL;
int rv;
MAKEEXTRALIST(flag, extra); MAKEEXTRALIST(flag, extra, "");
return (rk_strsvisx(dst, src, len, flag, extra)); if (!extra) {
*dst = '\0'; /* can't create extra, return "" */
return 0;
}
rv = strsvisx(dst, src, len, flag, extra);
free(extra);
return rv;
} }
#endif

32
lib/roken/vis.hin
View File

@@ -1,5 +1,4 @@
/* $NetBSD: vis.h,v 1.11 1999/11/25 16:55:50 wennmach Exp $ */ /* $NetBSD: vis.h,v 1.16 2005/09/13 01:44:32 christos Exp $ */
/* $Id$ */
/*- /*-
* Copyright (c) 1990, 1993 * Copyright (c) 1990, 1993
@@ -43,6 +42,8 @@
#endif #endif
#endif #endif
#include <sys/types.h>
/* /*
* to select alternate encoding format * to select alternate encoding format
*/ */
@@ -63,6 +64,7 @@
* other * other
*/ */
#define VIS_NOSLASH 0x40 /* inhibit printing '\' */ #define VIS_NOSLASH 0x40 /* inhibit printing '\' */
#define VIS_HTTPSTYLE 0x80 /* http-style escape % HEX HEX */
/* /*
* unvis return codes * unvis return codes
@@ -78,22 +80,28 @@
*/ */
#define UNVIS_END 1 /* no more characters */ #define UNVIS_END 1 /* no more characters */
char ROKEN_LIB_FUNCTION #include <sys/cdefs.h>
*rk_vis (char *, int, int, int);
char ROKEN_LIB_FUNCTION __BEGIN_DECLS
*rk_svis (char *, int, int, int, const char *); char * ROKEN_LIB_FUNCTION
rk_vis(char *, int, int, int);
char * ROKEN_LIB_FUNCTION
rk_svis(char *, int, int, int, const char *);
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strvis (char *, const char *, int); rk_strvis(char *, const char *, int);
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strsvis (char *, const char *, int, const char *); rk_strsvis(char *, const char *, int, const char *);
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strvisx (char *, const char *, size_t, int); rk_strvisx(char *, const char *, size_t, int);
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strsvisx (char *, const char *, size_t, int, const char *); rk_strsvisx(char *, const char *, size_t, int, const char *);
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_strunvis (char *, const char *); rk_strunvis(char *, const char *);
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rk_unvis (char *, int, int *, int); rk_strunvisx(char *, const char *, int);
int ROKEN_LIB_FUNCTION
rk_unvis(char *, int, int *, int);
__END_DECLS
#undef vis #undef vis
#define vis(a,b,c,d) rk_vis(a,b,c,d) #define vis(a,b,c,d) rk_vis(a,b,c,d)