sync from head

3 files changed, 2 insertions, 173 deletions

diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile
index 27fea4b..59528ef 100644
--- a/usr.bin/unvis/Makefile
+++ b/usr.bin/unvis/Makefile
@@ -3,4 +3,6 @@
 
 PROG=	unvis
 
+.PATH: ${.CURDIR}/../../contrib/unvis
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
deleted file mode 100644
index e40d8df..0000000
--- a/usr.bin/unvis/unvis.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.\" Copyright (c) 1989, 1990, 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.
-.\" 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
-.\" 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.
-.\"
-.\"     @(#)unvis.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
-.\"
-.Dd June 6, 1993
-.Dt UNVIS 1
-.Os
-.Sh NAME
-.Nm unvis
-.Nd "revert a visual representation of data back to original form"
-.Sh SYNOPSIS
-.Nm
-.Op Ar
-.Sh DESCRIPTION
-The
-.Nm
-utility is the inverse function of
-.Xr vis 1 .
-It reverts
-a visual representation of data back to its original form on standard output.
-.Sh SEE ALSO
-.Xr vis 1 ,
-.Xr unvis 3 ,
-.Xr vis 3
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.4 .
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
deleted file mode 100644
index 0ae054b..0000000
--- a/usr.bin/unvis/unvis.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * 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.
- * 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
- * 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.
- */
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <vis.h>
-
-void process(FILE *, const char *);
-static void usage(void);
-
-int
-main(int argc, char *argv[])
-{
-	FILE *fp;
-	int ch;
-
-	while ((ch = getopt(argc, argv, "")) != -1)
-		switch((char)ch) {
-		case '?':
-		default:
-			usage();
-		}
-	argc -= optind;
-	argv += optind;
-
-	if (*argv)
-		while (*argv) {
-			if ((fp=fopen(*argv, "r")) != NULL)
-				process(fp, *argv);
-			else
-				warn("%s", *argv);
-			argv++;
-		}
-	else
-		process(stdin, "<stdin>");
-	exit(0);
-}
-
-static void
-usage(void)
-{
-	fprintf(stderr, "usage: unvis [file ...]\n");
-	exit(1);
-}
-
-void
-process(FILE *fp, const char *filename)
-{
-	int offset = 0, c, ret;
-	int state = 0;
-	char outc;
-
-	while ((c = getc(fp)) != EOF) {
-		offset++;
-	again:
-		switch(ret = unvis(&outc, (char)c, &state, 0)) {
-		case UNVIS_VALID:
-			putchar(outc);
-			break;
-		case UNVIS_VALIDPUSH:
-			putchar(outc);
-			goto again;
-		case UNVIS_SYNBAD:
-			warnx("%s: offset: %d: can't decode", filename, offset);
-			state = 0;
-			break;
-		case 0:
-		case UNVIS_NOCHAR:
-			break;
-		default:
-			errx(1, "bad return value (%d), can't happen", ret);
-		}
-	}
-	if (unvis(&outc, (char)0, &state, UNVIS_END) == UNVIS_VALID)
-		putchar(outc);
-}