From 39801cccde9765d044c8937e051322feaa7ae268 Mon Sep 17 00:00:00 2001
From: jtc <jtc@NetBSD.org>
Date: Thu, 8 Dec 1994 09:30:36 +0000
Subject: [PATCH] Merged with 4.4lite. Changed to conform to NetBSD's new RCS
 Id convention.

---
 usr.bin/time/Makefile        |   4 +-
 usr.bin/time/time.1          |  11 ++--
 usr.bin/time/time.c          |  18 +++---
 usr.bin/tip/Makefile         |  21 +++----
 usr.bin/tip/acu.c            |  16 ++++--
 usr.bin/tip/aculib/biz22.c   |  12 ++--
 usr.bin/tip/aculib/biz31.c   |  12 ++--
 usr.bin/tip/aculib/courier.c |  18 ++++--
 usr.bin/tip/aculib/df.c      |  12 ++--
 usr.bin/tip/aculib/dn11.c    |  12 ++--
 usr.bin/tip/aculib/hayes.c   |  12 ++--
 usr.bin/tip/aculib/t3000.c   |   5 ++
 usr.bin/tip/aculib/v3451.c   |  12 ++--
 usr.bin/tip/aculib/v831.c    |  12 ++--
 usr.bin/tip/aculib/ventel.c  |  12 ++--
 usr.bin/tip/acutab.c         |  16 ++++--
 usr.bin/tip/cmds.c           |  19 ++++---
 usr.bin/tip/cmdtab.c         |  12 ++--
 usr.bin/tip/cu.c             |  12 ++--
 usr.bin/tip/hunt.c           |  12 ++--
 usr.bin/tip/log.c            |  12 ++--
 usr.bin/tip/partab.c         |  12 ++--
 usr.bin/tip/pathnames.h      |   9 +--
 usr.bin/tip/remcap.c         |  13 +++--
 usr.bin/tip/remote.c         | 104 +++++++++++++++++++++++------------
 usr.bin/tip/tip.1            |  36 ++++++++----
 usr.bin/tip/tip.c            |  48 +++++++---------
 usr.bin/tip/tip.h            |  20 ++++---
 usr.bin/tip/tipout.c         |  12 ++--
 usr.bin/tip/uucplock.c       |  12 ++--
 usr.bin/tip/value.c          |  12 ++--
 usr.bin/tip/vars.c           |  12 ++--
 32 files changed, 358 insertions(+), 204 deletions(-)

diff --git a/usr.bin/time/Makefile b/usr.bin/time/Makefile
index 67bcfa1c3e3c..df8ff522d1df 100644
--- a/usr.bin/time/Makefile
+++ b/usr.bin/time/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.3 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.2 1993/07/30 23:50:28 mycroft Exp $
+#	$NetBSD: Makefile,v 1.3 1994/12/08 09:36:55 jtc Exp $
+#	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	time
 
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index 9983195f9114..986bf4654570 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: time.1,v 1.5 1994/12/08 09:36:57 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 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
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)time.1	6.4 (Berkeley) 4/23/91
-.\"	$Id: time.1,v 1.4 1994/01/11 18:49:24 jtc Exp $
+.\"     @(#)time.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd April 23, 1991
+.Dd June 6, 1993
 .Dt TIME 1
 .Os
 .Sh NAME
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 9884a70e0ff9..03b9ab29ef89 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: time.c,v 1.5 1994/12/08 09:36:59 jtc Exp $	*/
+
 /*
- * Copyright (c) 1987, 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1987, 1988, 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
@@ -32,14 +34,16 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1987, 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1987, 1988, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)time.c	4.9 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: time.c,v 1.4 1993/08/27 22:30:47 jtc Exp $";
+#if 0
+static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: time.c,v 1.5 1994/12/08 09:36:59 jtc Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/Makefile b/usr.bin/tip/Makefile
index 002ca1cf84f1..25218c0cae47 100644
--- a/usr.bin/tip/Makefile
+++ b/usr.bin/tip/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.9 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.3 1993/08/04 20:17:26 jtc Exp $
+#	$NetBSD: Makefile,v 1.4 1994/12/08 09:30:36 jtc Exp $
+#	@(#)Makefile	8.1 (Berkeley) 6/6/93
 #
 # Files are:
 #	/etc/remote		remote host description file
@@ -16,10 +16,11 @@
 #	VENTEL 212+
 #	VADIC 831 RS232 adaptor
 #	VADIC 3451
+#	TELEBIT T3000
 #
 # Configuration defines:
 #	DF02, DF03, DN11	ACU's supported
-#	  BIZ1031, BIZ1022, VENTEL, V831, V3451, HAYES, COURIER
+#	  BIZ1031, BIZ1022, VENTEL, V831, V3451, HAYES, COURIER, T3000
 #	ACULOG			turn on tip logging of ACU use
 #	PRISTINE		no phone #'s put in ACU log file
 #	CONNECT			worthless command
@@ -28,19 +29,19 @@
 #				writes on local side
 #	BUFSIZ			buffer sizing from stdio, must be fed
 #				explicitly to remcap.c if not 1024
+#	CONNECT			enable ~C command (connect pgm to remote)
 
 PROG=	tip
-CFLAGS+=-I${.CURDIR} -DV831 -DVENTEL -DHAYES -DCOURIER -DDEFBR=2400 \
-	-DDEFFS=BUFSIZ -DACULOG -DPRISTINE -DCONNECT
+CFLAGS+=-I${.CURDIR} \
+	-DDEFBR=1200 -DDEFFS=BUFSIZ -DACULOG -DPRISTINE -DCONNECT \
+	-DV831 -DVENTEL -DHAYES -DCOURIER -DT3000
 .PATH:	${.CURDIR}/aculib
 BINOWN=	uucp
 BINGRP=	dialer
 BINMODE=4510
-# LINKS=	${BINDIR}/tip ${BINDIR}/cu
-# MLINKS=	tip.1 cu.1
-SRCS=	acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c remcap.c \
-	remote.c tip.c tipout.c uucplock.c value.c vars.c biz22.c courier.c \
-	df.c dn11.c hayes.c v3451.c v831.c ventel.c
+SRCS=	acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c \
+	remote.c tip.c tipout.c uucplock.c value.c vars.c \
+	biz22.c courier.c df.c dn11.c hayes.c t3000.c v3451.c v831.c ventel.c
 
 # -- acutab is configuration dependent, and so depends on the Makefile
 # -- remote.o depends on the Makefile because of DEFBR and DEFFS
diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c
index 5359f9a1fc02..e2fa8b8bb0bc 100644
--- a/usr.bin/tip/acu.c
+++ b/usr.bin/tip/acu.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: acu.c,v 1.3 1994/12/08 09:30:39 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)acu.c	5.8 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: acu.c,v 1.2 1993/08/01 18:06:46 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)acu.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: acu.c,v 1.3 1994/12/08 09:30:39 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
@@ -103,6 +107,8 @@ connect()
 				*cp++ = '\0';
 			
 			if (conflag = (*acu->acu_dialer)(phnum, CU)) {
+				if (CM != NOSTR)
+					pwrite(FD, CM, size(CM));
 				logent(value(HOST), phnum, acu->acu_name,
 					"call completed");
 				return (NOSTR);
@@ -139,6 +145,8 @@ connect()
 			
 			if (conflag = (*acu->acu_dialer)(phnum, CU)) {
 				fclose(fd);
+				if (CM != NOSTR)
+					pwrite(FD, CM, size(CM));
 				logent(value(HOST), phnum, acu->acu_name,
 					"call completed");
 				return (NOSTR);
diff --git a/usr.bin/tip/aculib/biz22.c b/usr.bin/tip/aculib/biz22.c
index 49bc3822cb7f..db9e8da3ca84 100644
--- a/usr.bin/tip/aculib/biz22.c
+++ b/usr.bin/tip/aculib/biz22.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: biz22.c,v 1.3 1994/12/08 09:31:31 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)biz22.c	5.5 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: biz22.c,v 1.2 1993/08/01 18:06:54 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)biz22.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: biz22.c,v 1.3 1994/12/08 09:31:31 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/aculib/biz31.c b/usr.bin/tip/aculib/biz31.c
index 1029b2a9375f..15185cd58a41 100644
--- a/usr.bin/tip/aculib/biz31.c
+++ b/usr.bin/tip/aculib/biz31.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: biz31.c,v 1.3 1994/12/08 09:31:33 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)biz31.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: biz31.c,v 1.2 1993/08/01 18:06:53 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)biz31.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: biz31.c,v 1.3 1994/12/08 09:31:33 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/aculib/courier.c b/usr.bin/tip/aculib/courier.c
index 8c726107f3ef..fbf56b99a556 100644
--- a/usr.bin/tip/aculib/courier.c
+++ b/usr.bin/tip/aculib/courier.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: courier.c,v 1.4 1994/12/08 09:31:35 jtc Exp $	*/
+
 /*
- * Copyright (c) 1986 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1986, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)courier.c	5.7 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: courier.c,v 1.3 1993/08/01 18:06:51 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)courier.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: courier.c,v 1.4 1994/12/08 09:31:35 jtc Exp $";
 #endif /* not lint */
 
 /*
@@ -80,7 +84,7 @@ badsynch:
 	sleep(1);
 #ifdef DEBUG
 	if (boolean(value(VERBOSE)))
-		verbose_read();
+		cour_verbose_read();
 #endif
 	ioctl(FD, TIOCFLUSH, 0);	/* flush any clutter */
 	cour_write(FD, "AT C1 E0 H0 Q0 X6 V1\r", 21);
@@ -172,6 +176,8 @@ struct baud_msg {
 	"",		B300,
 	" 1200",	B1200,
 	" 2400",	B2400,
+	" 9600",	B9600,
+	" 9600/ARQ",	B9600,
 	0,		0,
 };
 
@@ -318,7 +324,7 @@ int n;
 }
 
 #ifdef DEBUG
-verbose_read()
+cour_verbose_read()
 {
 	int n = 0;
 	char buf[BUFSIZ];
diff --git a/usr.bin/tip/aculib/df.c b/usr.bin/tip/aculib/df.c
index b2f5d00af25a..bc843d7291d7 100644
--- a/usr.bin/tip/aculib/df.c
+++ b/usr.bin/tip/aculib/df.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: df.c,v 1.3 1994/12/08 09:31:38 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)df.c	5.4 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: df.c,v 1.2 1993/08/01 18:06:59 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)df.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: df.c,v 1.3 1994/12/08 09:31:38 jtc Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/aculib/dn11.c b/usr.bin/tip/aculib/dn11.c
index eae2c321ce9b..d310deb723b3 100644
--- a/usr.bin/tip/aculib/dn11.c
+++ b/usr.bin/tip/aculib/dn11.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dn11.c,v 1.3 1994/12/08 09:31:40 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dn11.c	5.4 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: dn11.c,v 1.2 1993/08/01 18:06:58 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dn11.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: dn11.c,v 1.3 1994/12/08 09:31:40 jtc Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/aculib/hayes.c b/usr.bin/tip/aculib/hayes.c
index befe7f33d7e9..a35256fe318e 100644
--- a/usr.bin/tip/aculib/hayes.c
+++ b/usr.bin/tip/aculib/hayes.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: hayes.c,v 1.3 1994/12/08 09:31:42 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)hayes.c	5.4 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: hayes.c,v 1.2 1993/08/01 18:06:57 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)hayes.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: hayes.c,v 1.3 1994/12/08 09:31:42 jtc Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/aculib/t3000.c b/usr.bin/tip/aculib/t3000.c
index 5e07359d4d05..e6e1813a879f 100644
--- a/usr.bin/tip/aculib/t3000.c
+++ b/usr.bin/tip/aculib/t3000.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: t3000.c,v 1.2 1994/12/08 09:31:45 jtc Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,7 +34,10 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)t3000.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: t3000.c,v 1.2 1994/12/08 09:31:45 jtc Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/aculib/v3451.c b/usr.bin/tip/aculib/v3451.c
index 6d21b65da6e2..cd4077277c14 100644
--- a/usr.bin/tip/aculib/v3451.c
+++ b/usr.bin/tip/aculib/v3451.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: v3451.c,v 1.3 1994/12/08 09:31:48 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)v3451.c	5.5 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: v3451.c,v 1.2 1993/08/01 18:06:56 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)v3451.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: v3451.c,v 1.3 1994/12/08 09:31:48 jtc Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/aculib/v831.c b/usr.bin/tip/aculib/v831.c
index 7ab1e4cea16a..5a7d92fea45c 100644
--- a/usr.bin/tip/aculib/v831.c
+++ b/usr.bin/tip/aculib/v831.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: v831.c,v 1.3 1994/12/08 09:31:50 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)v831.c	5.5 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: v831.c,v 1.2 1993/08/01 18:06:55 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)v831.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: v831.c,v 1.3 1994/12/08 09:31:50 jtc Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/aculib/ventel.c b/usr.bin/tip/aculib/ventel.c
index 81852a37a184..9ebb4188ce15 100644
--- a/usr.bin/tip/aculib/ventel.c
+++ b/usr.bin/tip/aculib/ventel.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: ventel.c,v 1.3 1994/12/08 09:31:52 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)ventel.c	5.4 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: ventel.c,v 1.2 1993/08/01 18:06:55 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)ventel.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: ventel.c,v 1.3 1994/12/08 09:31:52 jtc Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/acutab.c b/usr.bin/tip/acutab.c
index e4a35c9c8b6f..774d5e729994 100644
--- a/usr.bin/tip/acutab.c
+++ b/usr.bin/tip/acutab.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)acutab.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: acutab.c,v 1.2 1993/08/01 18:06:45 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)acutab.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
@@ -46,6 +50,7 @@ extern int df02_dialer(), df03_dialer(), df_disconnect(), df_abort(),
 	   ven_dialer(), ven_disconnect(), ven_abort(),
 	   hay_dialer(), hay_disconnect(), hay_abort(),
 	   cour_dialer(), cour_disconnect(), cour_abort(),
+	   t3000_dialer(), t3000_disconnect(), t3000_abort(),
 	   v3451_dialer(), v3451_disconnect(), v3451_abort(),
 	   v831_dialer(), v831_disconnect(), v831_abort(),
 	   dn_dialer(), dn_disconnect(), dn_abort();
@@ -77,6 +82,9 @@ acu_t acutable[] = {
 #ifdef COURIER
 	"courier",cour_dialer,	cour_disconnect,	cour_abort,
 #endif
+#ifdef T3000
+	"t3000",t3000_dialer,	t3000_disconnect,	t3000_abort,
+#endif
 #ifdef V3451
 #ifndef V831
 	"vadic",v3451_dialer,	v3451_disconnect,	v3451_abort,
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 0d3200cd642f..0ff7f7810da7 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: cmds.c,v 1.3 1994/12/08 09:30:43 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)cmds.c	5.15 (Berkeley) 3/4/91";*/
-static char rcsid[] = "$Id: cmds.c,v 1.2 1993/08/01 18:06:43 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: cmds.c,v 1.3 1994/12/08 09:30:43 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
@@ -126,6 +130,7 @@ transfer(buf, fd, eofchars)
 	register int cnt, eof;
 	time_t start;
 	sig_t f;
+	char r;
 
 	pwrite(FD, buf, size(buf));
 	quit = 0;
@@ -135,7 +140,8 @@ transfer(buf, fd, eofchars)
 	/*
 	 * finish command
 	 */
-	pwrite(FD, "\r", 1);
+	r = '\r';
+	pwrite(FD, &r, 1);
 	do
 		read(FD, &c, 1); 
 	while ((c&0177) != '\n');
@@ -530,9 +536,8 @@ consh(c)
 	} else {
 		register int i;
 
-		dup2(1, 2);
 		dup2(FD, 0);
-		dup2(0, 1);
+		dup2(3, 1);
 		for (i = 3; i < 20; i++)
 			close(i);
 		signal(SIGINT, SIG_DFL);
diff --git a/usr.bin/tip/cmdtab.c b/usr.bin/tip/cmdtab.c
index 5557947f0ba1..912cb6d87c2b 100644
--- a/usr.bin/tip/cmdtab.c
+++ b/usr.bin/tip/cmdtab.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)cmdtab.c	5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: cmdtab.c,v 1.2 1993/08/01 18:06:42 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index e9eaf6e23bde..de1162fa4656 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: cu.c,v 1.3 1994/12/08 09:30:48 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)cu.c	5.9 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: cu.c,v 1.2 1993/08/01 18:06:41 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)cu.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: cu.c,v 1.3 1994/12/08 09:30:48 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/hunt.c b/usr.bin/tip/hunt.c
index ab6d3e8d7306..0169ae041f7b 100644
--- a/usr.bin/tip/hunt.c
+++ b/usr.bin/tip/hunt.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: hunt.c,v 1.3 1994/12/08 09:30:50 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)hunt.c	5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: hunt.c,v 1.2 1993/08/01 18:06:40 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)hunt.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: hunt.c,v 1.3 1994/12/08 09:30:50 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/log.c b/usr.bin/tip/log.c
index 7aeee44a3d44..0685c3792dd3 100644
--- a/usr.bin/tip/log.c
+++ b/usr.bin/tip/log.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: log.c,v 1.3 1994/12/08 09:30:53 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)log.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: log.c,v 1.2 1993/08/01 18:06:39 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: log.c,v 1.3 1994/12/08 09:30:53 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/partab.c b/usr.bin/tip/partab.c
index 43300e38fcce..cbed13107dd4 100644
--- a/usr.bin/tip/partab.c
+++ b/usr.bin/tip/partab.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: partab.c,v 1.3 1994/12/08 09:30:55 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)partab.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: partab.c,v 1.2 1993/08/01 18:06:38 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)partab.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: partab.c,v 1.3 1994/12/08 09:30:55 jtc Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/pathnames.h b/usr.bin/tip/pathnames.h
index 6057dd11bbb8..00b126d36945 100644
--- a/usr.bin/tip/pathnames.h
+++ b/usr.bin/tip/pathnames.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $	*/
+
 /*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * 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
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pathnames.h	5.2 (Berkeley) 6/1/90
- *	$Id: pathnames.h,v 1.2 1993/08/01 18:06:29 mycroft Exp $
+ *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
  */
 
 #include <paths.h>
diff --git a/usr.bin/tip/remcap.c b/usr.bin/tip/remcap.c
index d4c4c39f2c43..906180b8315c 100644
--- a/usr.bin/tip/remcap.c
+++ b/usr.bin/tip/remcap.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: remcap.c,v 1.4 1994/12/08 09:31:01 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)remcap.c	5.5 (Berkeley) 2/2/91";*/
-static char rcsid[] = "$Id: remcap.c,v 1.3 1993/08/01 18:06:37 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)remcap.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: remcap.c,v 1.4 1994/12/08 09:31:01 jtc Exp $";
 #endif /* not lint */
 
 /*
@@ -45,6 +49,7 @@ static char rcsid[] = "$Id: remcap.c,v 1.3 1993/08/01 18:06:37 mycroft Exp $";
 #include <fcntl.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <stdlib.h>
 #include "pathnames.h"
 
 #ifndef BUFSIZ
diff --git a/usr.bin/tip/remote.c b/usr.bin/tip/remote.c
index 0ef5071861eb..a8f62c1be306 100644
--- a/usr.bin/tip/remote.c
+++ b/usr.bin/tip/remote.c
@@ -1,6 +1,9 @@
+/*	$NetBSD: remote.c,v 1.3 1994/12/08 09:31:03 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1992, 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
@@ -32,11 +35,23 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)remote.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: remote.c,v 1.2 1993/08/01 18:06:36 mycroft Exp $";
+static char copyright[] =
+"@(#) Copyright (c) 1992, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-# include "tip.h"
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)remote.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: remote.c,v 1.3 1994/12/08 09:31:03 jtc Exp $";
+#endif /* not lint */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "pathnames.h"
+#include "tip.h"
 
 /*
  * Attributes to be gleened from remote host description
@@ -52,19 +67,30 @@ static char *capstrings[] = {
 	"di", "es", "ex", "fo", "rc", "re", "pa", 0
 };
 
-char *rgetstr();
+static char	*db_array[3] = { _PATH_REMOTE, 0, 0 };
+
+#define cgetflag(f)	(cgetcap(bp, f, ':') != NULL)
 
 static
 getremcap(host)
 	register char *host;
 {
-	int stat;
-	char tbuf[BUFSIZ];
-	static char buf[BUFSIZ/2];
-	char *bp = buf;
 	register char **p, ***q;
+	char *bp;
+	char *rempath;
+	int   stat;
 
-	if ((stat = rgetent(tbuf, host)) <= 0) {
+	rempath = getenv("REMOTE");
+	if (rempath != NULL)
+		if (*rempath != '/')
+			/* we have an entry */
+			cgetset(rempath);
+		else {	/* we have a path */
+			db_array[1] = rempath;
+			db_array[2] = _PATH_REMOTE;
+		}
+
+	if ((stat = cgetent(&bp, db_array, host)) < 0) {
 		if (DV ||
 		    host[0] == '/' && access(DV = host, R_OK | W_OK) == 0) {
 			CU = DV;
@@ -76,23 +102,33 @@ getremcap(host)
 			FS = DEFFS;
 			return;
 		}
-		fprintf(stderr, stat == 0 ?
-			"tip: unknown host %s\n" :
-			"tip: can't open host description file\n", host);
+		switch(stat) {
+		case -1:
+			fprintf(stderr, "tip: unknown host %s\n", host);
+			break;
+		case -2:
+			fprintf(stderr, 
+			    "tip: can't open host description file\n");
+			break;
+		case -3:
+			fprintf(stderr, 
+			    "tip: possible reference loop in host description file\n");
+			break;
+		}
 		exit(3);
 	}
 
 	for (p = capstrings, q = caps; *p != NULL; p++, q++)
 		if (**q == NULL)
-			**q = rgetstr(*p, &bp);
-	if (!BR && (BR = rgetnum("br")) < 0)
+			cgetstr(bp, *p, *q);
+	if (!BR && (cgetnum(bp, "br", &BR) == -1))
 		BR = DEFBR;
-	if ((FS = rgetnum("fs")) < 0)
+	if (cgetnum(bp, "fs", &FS) == -1)
 		FS = DEFFS;
 	if (DU < 0)
 		DU = 0;
 	else
-		DU = rgetflag("du");
+		DU = cgetflag("du");
 	if (DV == NOSTR) {
 		fprintf(stderr, "%s: missing device spec\n", host);
 		exit(3);
@@ -104,7 +140,7 @@ getremcap(host)
 		exit(3);
 	}
 
-	HD = rgetflag("hd");
+	HD = cgetflag("hd");
 
 	/*
 	 * This effectively eliminates the "hw" attribute
@@ -116,29 +152,29 @@ getremcap(host)
 	/*
 	 * see if uppercase mode should be turned on initially
 	 */
-	if (rgetflag("ra"))
+	if (cgetflag("ra"))
 		boolean(value(RAISE)) = 1;
-	if (rgetflag("ec"))
+	if (cgetflag("ec"))
 		boolean(value(ECHOCHECK)) = 1;
-	if (rgetflag("be"))
+	if (cgetflag("be"))
 		boolean(value(BEAUTIFY)) = 1;
-	if (rgetflag("nb"))
+	if (cgetflag("nb"))
 		boolean(value(BEAUTIFY)) = 0;
-	if (rgetflag("sc"))
+	if (cgetflag("sc"))
 		boolean(value(SCRIPT)) = 1;
-	if (rgetflag("tb"))
+	if (cgetflag("tb"))
 		boolean(value(TABEXPAND)) = 1;
-	if (rgetflag("vb"))
+	if (cgetflag("vb"))
 		boolean(value(VERBOSE)) = 1;
-	if (rgetflag("nv"))
+	if (cgetflag("nv"))
 		boolean(value(VERBOSE)) = 0;
-	if (rgetflag("ta"))
+	if (cgetflag("ta"))
 		boolean(value(TAND)) = 1;
-	if (rgetflag("nt"))
+	if (cgetflag("nt"))
 		boolean(value(TAND)) = 0;
-	if (rgetflag("rw"))
+	if (cgetflag("rw"))
 		boolean(value(RAWFTP)) = 1;
-	if (rgetflag("hd"))
+	if (cgetflag("hd"))
 		boolean(value(HALFDUPLEX)) = 1;
 	if (RE == NOSTR)
 		RE = (char *)"tip.record";
@@ -152,11 +188,11 @@ getremcap(host)
 		vstring("pr", PR);
 	if (RC != NOSTR)
 		vstring("rc", RC);
-	if ((DL = rgetnum("dl")) < 0)
+	if (cgetnum(bp, "dl", &DL) == -1)
 		DL = 0;
-	if ((CL = rgetnum("cl")) < 0)
+	if (cgetnum(bp, "cl", &CL) == -1)
 		CL = 0;
-	if ((ET = rgetnum("et")) < 0)
+	if (cgetnum(bp, "et", &ET) == -1)
 		ET = 10;
 }
 
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index 7019c50a03e8..6d550c07578a 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1990 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: tip.1,v 1.7 1994/12/08 09:31:05 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 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
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)tip.1	6.8 (Berkeley) 7/27/91
-.\"	$Id: tip.1,v 1.6 1994/09/19 12:26:18 mycroft Exp $
+.\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
 .\"
-.Dd July 27, 1991
+.Dd April 18, 1994
 .Dt TIP 1
 .Os BSD 4
 .Sh NAME
@@ -127,7 +128,7 @@ defaults to the ``from'' file name if it isn't specified.
 The remote host
 executes the command string ``cat 'from';echo ^A'' to send the file to
 .Nm tip  .
-.It Ic \&~
+.It Ic \&~|
 Pipe the output from a remote command to a local
 .Ux
 process.
@@ -141,6 +142,19 @@ process to the remote host.
 The command string sent to the local
 .Ux
 system is processed by the shell.
+.It Ic \&~C
+Fork a child process on the local system to perform special protocols
+such as \s-1XMODEM\s+1.  The child program will be run with the following
+somewhat unusual arrangement of file descriptors:
+.nf
+.in +1i
+0 <-> local tty in
+1 <-> local tty out
+2 <-> local tty out
+3 <-> remote tty in
+4 <-> remote tty out
+.in -1i
+.fi
 .It Ic \&~#
 Send a
 .Dv BREAK
@@ -204,7 +218,7 @@ remote machine.
 guards against multiple users connecting to a remote system
 by opening modems and terminal lines with exclusive access,
 and by honoring the locking protocol used by
-.Xr uucp 1 .
+.Xr uucico 8 .
 .Pp
 During file transfers
 .Nm tip
@@ -239,7 +253,7 @@ Bizcomp 1031 and 1032 integral call unit/modems.
 maintains a set of
 .Ar variables
 which control its operation.
-Some of these variable are read-only to normal users (root is allowed
+Some of these variables are read-only to normal users (root is allowed
 to change anything of interest).  Variables may be displayed
 and set through the ``s'' escape.  The syntax for variables is patterned
 after
@@ -287,7 +301,7 @@ to wait for a connection to be established; abbreviated
 waiting for the echo of the last character transmitted; default is
 .Ar off  .
 .It Ar eofread
-(str) The set of characters which signify and end-of-transmission
+(str) The set of characters which signify an end-of-transmission
 during a ~< file transfer command; abbreviated
 .Ar eofr  .
 .It Ar eofwrite
@@ -320,7 +334,7 @@ writes when receiving files; abbreviated
 (str) The name of the host to which you are connected; abbreviated
 .Ar ho  .
 .It Ar prompt
-(char) The character which indicates and end-of-line on the remote
+(char) The character which indicates an end-of-line on the remote
 host; abbreviated
 .Ar pr  ;
 default value is `\en'.  This value is used to synchronize during
@@ -436,4 +450,4 @@ appeared command in
 .Bx 4.2 .
 .Sh BUGS
 The full set of variables is undocumented and should, probably, be
-paired down.
+pared down.
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index f1662ab71c9e..5fc192b11453 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: tip.c,v 1.6 1994/12/08 09:31:07 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,14 +34,16 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1983, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)tip.c	5.15 (Berkeley) 2/4/91";*/
-static char rcsid[] = "$Id: tip.c,v 1.5 1994/04/20 17:21:28 pk Exp $";
+#if 0
+static char sccsid[] = "@(#)tip.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: tip.c,v 1.6 1994/12/08 09:31:07 jtc Exp $";
 #endif /* not lint */
 
 /*
@@ -252,7 +256,6 @@ static int uidswapped;
 user_uid()
 {
 	if (uidswapped == 0) {
-		setegid(gid);
 		seteuid(uid);
 		uidswapped = 1;
 	}
@@ -263,16 +266,13 @@ daemon_uid()
 
 	if (uidswapped) {
 		seteuid(euid);
-		setegid(egid);
 		uidswapped = 0;
 	}
 }
 
 shell_uid()
 {
-
-	setgid(gid);
-	setuid(uid);
+	seteuid(uid);
 }
 
 /*
@@ -387,6 +387,8 @@ tipin()
 	}
 }
 
+extern esctable_t etable[];
+
 /*
  * Escape handler --
  *  called on recognition of ``escapec'' at the beginning of a line
@@ -396,7 +398,6 @@ escape()
 	register char gch;
 	register esctable_t *p;
 	char c = character(value(ESCAPE));
-	extern esctable_t etable[];
 
 	gch = (getchar()&0177);
 	for (p = etable; p->e_char; p++)
@@ -493,7 +494,6 @@ help(c)
 	char c;
 {
 	register esctable_t *p;
-	extern esctable_t etable[];
 
 	printf("%c\r\n", c);
 	for (p = etable; p->e_char; p++) {
@@ -555,22 +555,12 @@ pwrite(fd, buf, n)
 	extern int errno;
 
 	bp = buf;
-	if (bits8 == 0) {
-		static char *mbp; static sz;
-
-		if (mbp == 0 || n > sz) {
-			if (mbp)
-				free(mbp);
-			mbp = (char *) malloc(n);
-			sz = n;
+	if (bits8 == 0)
+		for (i = 0; i < n; i++) {
+			*bp = partab[(*bp) & 0177];
+			bp++;
 		}
-		
-		bp = mbp;
-		for (i = 0; i < n; i++)
-			*bp++ = partab[*buf++ & 0177];
-		bp = mbp;
-	}
-	if (write(fd, bp, n) < 0) {
+	if (write(fd, buf, n) < 0) {
 		if (errno == EIO)
 			tipabort("Lost carrier.");
 		/* this is questionable */
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index 6e5515941331..e96946656cb9 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,6 +1,9 @@
+/*	$NetBSD: tip.h,v 1.3 1994/12/08 09:31:10 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * 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
@@ -30,8 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)tip.h	5.7 (Berkeley) 3/27/91
- *	$Id: tip.h,v 1.2 1993/08/01 18:06:28 mycroft Exp $
+ *      @(#)tip.h	8.1 (Berkeley) 6/6/93
  */
 
 /*
@@ -72,8 +74,8 @@ char	*PH;			/* phone number file */
 char	*RM;			/* remote file name */
 char	*HO;			/* host name */
 
-int	BR;			/* line speed for conversation */
-int	FS;			/* frame size for transfers */
+long	BR;			/* line speed for conversation */
+long	FS;			/* frame size for transfers */
 
 char	DU;			/* this host is dialed up */
 char	HW;			/* this device is hardwired, see hunt.c */
@@ -83,9 +85,9 @@ char	*FO;			/* force (literal next) char*/
 char	*RC;			/* raise character */
 char	*RE;			/* script record file */
 char	*PR;			/* remote prompt */
-int	DL;			/* line delay for file transfers to remote */
-int	CL;			/* char delay for file transfers to remote */
-int	ET;			/* echocheck timeout */
+long	DL;			/* line delay for file transfers to remote */
+long	CL;			/* char delay for file transfers to remote */
+long	ET;			/* echocheck timeout */
 char	HD;			/* this host is half duplex - do local echo */
 
 /*
diff --git a/usr.bin/tip/tipout.c b/usr.bin/tip/tipout.c
index 2cd0cc1449de..9ee5a02b0b67 100644
--- a/usr.bin/tip/tipout.c
+++ b/usr.bin/tip/tipout.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: tipout.c,v 1.3 1994/12/08 09:31:12 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)tipout.c	5.4 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: tipout.c,v 1.2 1993/08/01 18:06:34 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)tipout.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: tipout.c,v 1.3 1994/12/08 09:31:12 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/uucplock.c b/usr.bin/tip/uucplock.c
index 1cd6d0696f38..798355aef7c0 100644
--- a/usr.bin/tip/uucplock.c
+++ b/usr.bin/tip/uucplock.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: uucplock.c,v 1.4 1994/12/08 09:31:14 jtc Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)uucplock.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: uucplock.c,v 1.3 1993/08/01 18:06:33 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: uucplock.c,v 1.4 1994/12/08 09:31:14 jtc Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/tip/value.c b/usr.bin/tip/value.c
index 7fded06f5343..76163740b19b 100644
--- a/usr.bin/tip/value.c
+++ b/usr.bin/tip/value.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: value.c,v 1.3 1994/12/08 09:31:17 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)value.c	5.5 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: value.c,v 1.2 1993/08/01 18:06:32 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)value.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: value.c,v 1.3 1994/12/08 09:31:17 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/vars.c b/usr.bin/tip/vars.c
index 6a1a2137837e..9a708c1d88fd 100644
--- a/usr.bin/tip/vars.c
+++ b/usr.bin/tip/vars.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $	*/
+
 /*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)vars.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: vars.c,v 1.2 1993/08/01 18:06:31 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $";
 #endif /* not lint */
 
 #include "tip.h"