Mercurial > hg > dhcpcd

changeset 2714:a86837574ca2 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
We only supply svis(3) so rename the files as such.
author Roy Marples <roy@marples.name>
date Sat, 27 Sep 2014 00:12:21 +0000
parents a31491d53dfd
children 393ea2479ef7
files compat/svis.c compat/svis.h compat/vis.c compat/vis.h configure
diffstat 5 files changed, 181 insertions(+), 181 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compat/svis.c	Sat Sep 27 00:12:21 2014 +0000
@@ -0,0 +1,160 @@
+/*	$NetBSD: vis.c,v 1.44 2011/03/12 19:52:48 christos 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.
+ */
+
+/*-
+ * Copyright (c) 1999, 2005 The NetBSD Foundation, Inc.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*
+ * HEAVILY trimmed down for use only in dhcpcd.
+ * Please use the source in NetBSD for a fuller working copy.
+ */
+
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "svis.h"
+
+#undef BELL
+#define BELL '\a'
+
+#define isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
+#define iswhite(c)	(c == ' ' || c == '\t' || c == '\n')
+
+/*
+ * This is do_vis, the central code of vis.
+ * dst:	      Pointer to the destination buffer
+ * c:	      Character to encode
+ * flag:      Flag word
+ * nextc:     The character following 'c'
+ * extra:     Pointer to the list of extra characters to be
+ *	      backslash-protected.
+ */
+char *
+svis(char *dst, int c, int flag, int nextc, const char *extra)
+{
+	int isextra;
+
+	isextra = strchr(extra, c) != NULL;
+	if (!isextra && isascii(c) && (isgraph(c) || iswhite(c))) {
+		*dst++ = (char)c;
+		return dst;
+	}
+	if (flag & VIS_CSTYLE) {
+		switch (c) {
+		case '\n':
+			*dst++ = '\\'; *dst++ = 'n';
+			return dst;
+		case '\r':
+			*dst++ = '\\'; *dst++ = 'r';
+			return dst;
+		case '\b':
+			*dst++ = '\\'; *dst++ = 'b';
+			return dst;
+		case BELL:
+			*dst++ = '\\'; *dst++ = 'a';
+			return dst;
+		case '\v':
+			*dst++ = '\\'; *dst++ = 'v';
+			return dst;
+		case '\t':
+			*dst++ = '\\'; *dst++ = 't';
+			return dst;
+		case '\f':
+			*dst++ = '\\'; *dst++ = 'f';
+			return dst;
+		case ' ':
+			*dst++ = '\\'; *dst++ = 's';
+			return dst;
+		case '\0':
+			*dst++ = '\\'; *dst++ = '0';
+			if (isoctal(nextc)) {
+				*dst++ = '0';
+				*dst++ = '0';
+			}
+			return dst;
+		case '$': /* vis(1) - l */
+			break;
+		default:
+			if (isgraph(c)) {
+				*dst++ = '\\'; *dst++ = (char)c;
+				return dst;
+			}
+		}
+	}
+
+	*dst++ = '\\';
+	if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) {
+		*dst++ = (((unsigned char)c >> 6) & 03) + '0';
+		*dst++ = (((unsigned char)c >> 3) & 07) + '0';
+		*dst++ = ( (unsigned char)c       & 07) + '0';
+	} else {
+		if (c & 0200) {
+			c &= 0177; *dst++ = 'M';
+		}
+
+		if (iscntrl(c)) {
+			*dst++ = '^';
+			if (c == 0177)
+				*dst++ = '?';
+			else
+				*dst++ = (char)c + '@';
+		} else {
+			*dst++ = '-'; *dst++ = (char)c;
+		}
+	}
+	return dst;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compat/svis.h	Sat Sep 27 00:12:21 2014 +0000
@@ -0,0 +1,9 @@
+#ifndef SVIS_H
+#define SVIS_H
+
+#define	VIS_OCTAL	0x0001	/* use octal \ddd format */
+#define	VIS_CSTYLE	0x0002	/* use \[nrft0..] where appropiate */
+
+char *svis(char *dst, int c, int flag, int nextc, const char *meta);
+
+#endif
--- a/compat/vis.c	Fri Sep 26 23:20:35 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-/*	$NetBSD: vis.c,v 1.44 2011/03/12 19:52:48 christos 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.
- */
-
-/*-
- * Copyright (c) 1999, 2005 The NetBSD Foundation, Inc.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*
- * HEAVILY trimmed down for use only in dhcpcd.
- * Please use the source in NetBSD for a fuller working copy.
- */
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "vis.h"
-
-#undef BELL
-#define BELL '\a'
-
-#define isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-#define iswhite(c)	(c == ' ' || c == '\t' || c == '\n')
-
-/*
- * This is do_vis, the central code of vis.
- * dst:	      Pointer to the destination buffer
- * c:	      Character to encode
- * flag:      Flag word
- * nextc:     The character following 'c'
- * extra:     Pointer to the list of extra characters to be
- *	      backslash-protected.
- */
-char *
-svis(char *dst, int c, int flag, int nextc, const char *extra)
-{
-	int isextra;
-
-	isextra = strchr(extra, c) != NULL;
-	if (!isextra && isascii(c) && (isgraph(c) || iswhite(c))) {
-		*dst++ = (char)c;
-		return dst;
-	}
-	if (flag & VIS_CSTYLE) {
-		switch (c) {
-		case '\n':
-			*dst++ = '\\'; *dst++ = 'n';
-			return dst;
-		case '\r':
-			*dst++ = '\\'; *dst++ = 'r';
-			return dst;
-		case '\b':
-			*dst++ = '\\'; *dst++ = 'b';
-			return dst;
-		case BELL:
-			*dst++ = '\\'; *dst++ = 'a';
-			return dst;
-		case '\v':
-			*dst++ = '\\'; *dst++ = 'v';
-			return dst;
-		case '\t':
-			*dst++ = '\\'; *dst++ = 't';
-			return dst;
-		case '\f':
-			*dst++ = '\\'; *dst++ = 'f';
-			return dst;
-		case ' ':
-			*dst++ = '\\'; *dst++ = 's';
-			return dst;
-		case '\0':
-			*dst++ = '\\'; *dst++ = '0';
-			if (isoctal(nextc)) {
-				*dst++ = '0';
-				*dst++ = '0';
-			}
-			return dst;
-		case '$': /* vis(1) - l */
-			break;
-		default:
-			if (isgraph(c)) {
-				*dst++ = '\\'; *dst++ = (char)c;
-				return dst;
-			}
-		}
-	}
-
-	*dst++ = '\\';
-	if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) {
-		*dst++ = (((unsigned char)c >> 6) & 03) + '0';
-		*dst++ = (((unsigned char)c >> 3) & 07) + '0';
-		*dst++ = ( (unsigned char)c       & 07) + '0';
-	} else {
-		if (c & 0200) {
-			c &= 0177; *dst++ = 'M';
-		}
-
-		if (iscntrl(c)) {
-			*dst++ = '^';
-			if (c == 0177)
-				*dst++ = '?';
-			else
-				*dst++ = (char)c + '@';
-		} else {
-			*dst++ = '-'; *dst++ = (char)c;
-		}
-	}
-	return dst;
-}
--- a/compat/vis.h	Fri Sep 26 23:20:35 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#ifndef VIS_H
-#define VIS_H
-
-#define	VIS_OCTAL	0x0001	/* use octal \ddd format */
-#define	VIS_CSTYLE	0x0002	/* use \[nrft0..] where appropiate */
-
-char *svis(char *dst, int c, int flag, int nextc, const char *meta);
-
-#endif
--- a/configure	Fri Sep 26 23:20:35 2014 +0000
+++ b/configure	Sat Sep 27 00:12:21 2014 +0000
@@ -71,7 +71,7 @@
 	--without-md5) MD5=no;;
 	--without-sha2) SHA2=no;;
 	--without-sha256) SHA2=no;;
-	--without-vis) VIS=no;;
+	--without-svis) SVIS=no;;
 	--without-dev) DEV=no;;
 	--without-udev) UDEV=no;;
 	--serviceexists) SERVICEEXISTS=$var;;
@@ -628,9 +628,9 @@
 	echo "#include		\"compat/strlcpy.h\"" >>$CONFIG_H
 fi
 
-if [ -z "$VIS" ]; then
-	printf "Testing for vis ... "
-	cat <<EOF >_vis.c
+if [ -z "$SVIS" ]; then
+	printf "Testing for svis ... "
+	cat <<EOF >_svis.c
 #include <vis.h>
 int main(void) {
 	char s[10];
@@ -638,17 +638,17 @@
 	return 0;
 }
 EOF
-	if $XCC _vis.c -o _vis 2>&3; then
-		VIS=yes
+	if $XCC _svis.c -o _svis 2>&3; then
+		SVIS=yes
 	else
-		VIS=no
+		SVIS=no
 	fi
-	echo "$VIS"
-	rm -f _vis.c _vis
+	echo "$SVIS"
+	rm -f _svis.c _svis
 fi
-if [ "$VIS" = no ]; then
-	echo "COMPAT_SRCS+=	compat/vis.c" >>$CONFIG_MK
-	echo "#include		\"compat/vis.h\"" >>$CONFIG_H
+if [ "$SVIS" = no ]; then
+	echo "COMPAT_SRCS+=	compat/svis.c" >>$CONFIG_MK
+	echo "#include		\"compat/svis.h\"" >>$CONFIG_H
 else
 	echo "#define HAVE_VIS_H" >>$CONFIG_H
 fi