Carefully applied -Wall fixups from <panda@omatis.com>.

Also a little KNF.

23 files changed, 118 insertions, 108 deletions

diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c
index 91549e91741..9c2f93df57d 100644
--- a/usr.bin/tip/acu.c
+++ b/usr.bin/tip/acu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acu.c,v 1.7 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: acu.c,v 1.8 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: acu.c,v 1.4 1996/12/29 10:34:03 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)acu.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: acu.c,v 1.7 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: acu.c,v 1.8 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/aculib/biz22.c b/usr.bin/tip/aculib/biz22.c
index cd5ca4acfcc..b3f2a4acc01 100644
--- a/usr.bin/tip/aculib/biz22.c
+++ b/usr.bin/tip/aculib/biz22.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biz22.c,v 1.7 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: biz22.c,v 1.8 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: biz22.c,v 1.6 1997/02/11 09:24:11 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)biz22.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: biz22.c,v 1.7 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: biz22.c,v 1.8 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/aculib/courier.c b/usr.bin/tip/aculib/courier.c
index bfed40cf670..942b2dfb702 100644
--- a/usr.bin/tip/aculib/courier.c
+++ b/usr.bin/tip/aculib/courier.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: courier.c,v 1.10 2002/02/16 21:27:55 millert Exp $	*/
+/*	$OpenBSD: courier.c,v 1.11 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: courier.c,v 1.7 1997/02/11 09:24:16 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)courier.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: courier.c,v 1.10 2002/02/16 21:27:55 millert Exp $";
+static const char rcsid[] = "$OpenBSD: courier.c,v 1.11 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
@@ -51,10 +51,11 @@ static char rcsid[] = "$OpenBSD: courier.c,v 1.10 2002/02/16 21:27:55 millert Ex
 
 #define	MAXRETRY	5
 
+static	void cour_write(int fd, char *cp, int n);
 static	void sigALRM();
 static	int timeout = 0;
 static	int connected = 0;
-static	jmp_buf timeoutbuf, intbuf;
+static	jmp_buf timeoutbuf;
 static	int coursync(), cour_connect(), cour_swallow();
 void	cour_nap();
 
@@ -183,12 +184,12 @@ struct baud_msg {
 	char *msg;
 	int baud;
 } baud_msg[] = {
-	"",		B300,
-	" 1200",	B1200,
-	" 2400",	B2400,
-	" 9600",	B9600,
-	" 9600/ARQ",	B9600,
-	0,		0,
+	{ "",		B300 },
+	{ " 1200",	B1200 },
+	{ " 2400",	B2400 },
+	{ " 9600",	B9600 },
+	{ " 9600/ARQ",	B9600 },
+	{ 0,		0 },
 };
 
 static int
diff --git a/usr.bin/tip/aculib/df.c b/usr.bin/tip/aculib/df.c
index 2fa0a0b320a..4642f98c3d4 100644
--- a/usr.bin/tip/aculib/df.c
+++ b/usr.bin/tip/aculib/df.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: df.c,v 1.5 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: df.c,v 1.6 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: df.c,v 1.4 1995/10/29 00:49:51 pk Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)df.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: df.c,v 1.5 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: df.c,v 1.6 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
@@ -49,6 +49,8 @@ static char rcsid[] = "$OpenBSD: df.c,v 1.5 2001/10/24 18:38:58 millert Exp $";
 
 static jmp_buf Sjbuf;
 static void timeout();
+static int df_dialer(char *num, char *acu, int df03);
+static void df_disconnect();
 
 int
 df02_dialer(num, acu)
diff --git a/usr.bin/tip/aculib/dn11.c b/usr.bin/tip/aculib/dn11.c
index 3f346159429..c84bc05a4e0 100644
--- a/usr.bin/tip/aculib/dn11.c
+++ b/usr.bin/tip/aculib/dn11.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dn11.c,v 1.5 2001/11/19 19:02:16 mpech Exp $	*/
+/*	$OpenBSD: dn11.c,v 1.6 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: dn11.c,v 1.4 1995/10/29 00:49:53 pk Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dn11.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: dn11.c,v 1.5 2001/11/19 19:02:16 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: dn11.c,v 1.6 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/aculib/hayes.c b/usr.bin/tip/aculib/hayes.c
index 19ee8f80abe..e42e797b9f9 100644
--- a/usr.bin/tip/aculib/hayes.c
+++ b/usr.bin/tip/aculib/hayes.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hayes.c,v 1.8 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: hayes.c,v 1.9 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: hayes.c,v 1.6 1997/02/11 09:24:17 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)hayes.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: hayes.c,v 1.8 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: hayes.c,v 1.9 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
@@ -75,6 +75,11 @@ static	void sigALRM();
 static	int timeout = 0;
 static	jmp_buf timeoutbuf;
 static 	char gobble();
+static	void error_rep(char c);
+int	hay_sync(void);
+void	hay_disconnect(void);
+void	goodbye(void);
+
 #define DUMBUFLEN	40
 static char dumbuf[DUMBUFLEN];
 
@@ -209,8 +214,7 @@ gobble(match)
 }
 
 static void
-error_rep(c)
-	char c;
+error_rep(char c)
 {
 	printf("\n\r");
 	switch (c) {
diff --git a/usr.bin/tip/aculib/t3000.c b/usr.bin/tip/aculib/t3000.c
index 1f050910447..c3b8cb6595a 100644
--- a/usr.bin/tip/aculib/t3000.c
+++ b/usr.bin/tip/aculib/t3000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t3000.c,v 1.9 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: t3000.c,v 1.10 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: t3000.c,v 1.5 1997/02/11 09:24:18 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)t3000.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: t3000.c,v 1.9 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: t3000.c,v 1.10 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
@@ -55,9 +55,11 @@ static char rcsid[] = "$OpenBSD: t3000.c,v 1.9 2001/10/24 18:38:58 millert Exp $
 static	void sigALRM();
 static	int timeout = 0;
 static	int connected = 0;
-static	jmp_buf timeoutbuf, intbuf;
+static	jmp_buf timeoutbuf;
 static	int t3000_sync(), t3000_connect(), t3000_swallow();
+static	void t3000_write(int fd, char *cp, int n);
 static	void t3000_nap();
+void	t3000_disconnect();
 
 int
 t3000_dialer(num, acu)
@@ -188,20 +190,20 @@ struct tbaud_msg {
 	int baud;
 	int baud2;
 } tbaud_msg[] = {
-	"",		B300,	0,
-	" 1200",	B1200,	0,
-	" 2400",	B2400,	0,
-	" 4800",	B4800,	0,
-	" 9600",	B9600,	0,
-	" 14400",	B19200,	B9600,
-	" 19200",	B19200,	B9600,
-	" 38400",	B38400,	B9600,
-	" 57600",	B38400,	B9600,
-	" 7512",	B9600,	0,
-	" 1275",	B2400,	0,
-	" 7200",	B9600,	0,
-	" 12000",	B19200,	B9600,
-	0,		0,	0,
+	{ "",		B300,	0 },
+	{ " 1200",	B1200,	0 },
+	{ " 2400",	B2400,	0 },
+	{ " 4800",	B4800,	0 },
+	{ " 9600",	B9600,	0 },
+	{ " 14400",	B19200,	B9600 },
+	{ " 19200",	B19200,	B9600 },
+	{ " 38400",	B38400,	B9600 },
+	{ " 57600",	B38400,	B9600 },
+	{ " 7512",	B9600,	0 },
+	{ " 1275",	B2400,	0 },
+	{ " 7200",	B9600,	0 },
+	{ " 12000",	B19200,	B9600 },
+	{ 0,		0,	0 },
 };
 
 static int
@@ -322,7 +324,7 @@ if (len == 0) len = 1;
 	return (0);
 }
 
-static int
+static void
 t3000_write(fd, cp, n)
 int fd;
 char *cp;
diff --git a/usr.bin/tip/aculib/v3451.c b/usr.bin/tip/aculib/v3451.c
index 1440c551e0e..b4b902dcfb6 100644
--- a/usr.bin/tip/aculib/v3451.c
+++ b/usr.bin/tip/aculib/v3451.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: v3451.c,v 1.6 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: v3451.c,v 1.7 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: v3451.c,v 1.6 1997/02/11 09:24:20 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)v3451.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: v3451.c,v 1.6 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: v3451.c,v 1.7 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/aculib/v831.c b/usr.bin/tip/aculib/v831.c
index 005e5d931e5..b7f54e496fd 100644
--- a/usr.bin/tip/aculib/v831.c
+++ b/usr.bin/tip/aculib/v831.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: v831.c,v 1.6 2001/11/19 19:02:16 mpech Exp $	*/
+/*	$OpenBSD: v831.c,v 1.7 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: v831.c,v 1.5 1996/12/29 10:42:01 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)v831.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: v831.c,v 1.6 2001/11/19 19:02:16 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: v831.c,v 1.7 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/aculib/ventel.c b/usr.bin/tip/aculib/ventel.c
index 48035c177d2..54ed6873f89 100644
--- a/usr.bin/tip/aculib/ventel.c
+++ b/usr.bin/tip/aculib/ventel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ventel.c,v 1.7 2001/11/19 19:02:16 mpech Exp $	*/
+/*	$OpenBSD: ventel.c,v 1.8 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: ventel.c,v 1.6 1997/02/11 09:24:21 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)ventel.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: ventel.c,v 1.7 2001/11/19 19:02:16 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: ventel.c,v 1.8 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
@@ -57,6 +57,7 @@ static	jmp_buf timeoutbuf;
 
 static	int gobble(), vensync();
 static	void echo();
+void	ven_disconnect();
 
 /*
  * some sleep calls have been replaced by this macro
@@ -120,7 +121,7 @@ ven_dialer(num, acu)
 	cp = strchr(line, '\r');
 	if (cp)
 		*cp = '\0';
-	for (cp = line; cp = strchr(cp, ' '); cp++)
+	for (cp = line; (cp = strchr(cp, ' ')) != NULL; cp++)
 		if (cp[1] == ' ')
 			break;
 	if (cp) {
@@ -158,22 +159,22 @@ echo(s)
 {
 	char c;
 
-	while (c = *s++) switch (c) {
-
-	case '$':
-		read(FD, &c, 1);
-		s++;
-		break;
+	while ((c = *s++) != NULL)
+		switch (c) {
+		case '$':
+			read(FD, &c, 1);
+			s++;
+			break;
 
-	case '#':
-		c = *s++;
-		write(FD, &c, 1);
-		break;
+		case '#':
+			c = *s++;
+			write(FD, &c, 1);
+			break;
 
-	default:
-		write(FD, &c, 1);
-		read(FD, &c, 1);
-	}
+		default:
+			write(FD, &c, 1);
+			read(FD, &c, 1);
+		}
 }
 
 static void
diff --git a/usr.bin/tip/acutab.c b/usr.bin/tip/acutab.c
index 193b8cc70ca..e8bbd5e1882 100644
--- a/usr.bin/tip/acutab.c
+++ b/usr.bin/tip/acutab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acutab.c,v 1.2 1996/06/26 05:40:41 deraadt Exp $	*/
+/*	$OpenBSD: acutab.c,v 1.3 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)acutab.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: acutab.c,v 1.2 1996/06/26 05:40:41 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: acutab.c,v 1.3 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
@@ -58,46 +58,46 @@ extern int df02_dialer(), df03_dialer(), df_disconnect(), df_abort(),
 
 acu_t acutable[] = {
 #if BIZ1031
-	"biz31f", biz31f_dialer, biz31_disconnect,	biz31_abort,
-	"biz31w", biz31w_dialer, biz31_disconnect,	biz31_abort,
+	{ "biz31f",	biz31f_dialer,	biz31_disconnect,	biz31_abort },
+	{ "biz31w",	biz31w_dialer,	biz31_disconnect,	biz31_abort },
 #endif
 #if BIZ1022
-	"biz22f", biz22f_dialer, biz22_disconnect,	biz22_abort,
-	"biz22w", biz22w_dialer, biz22_disconnect,	biz22_abort,
+	{ "biz22f",	biz22f_dialer,	biz22_disconnect,	biz22_abort },
+	{ "biz22w",	biz22w_dialer,	biz22_disconnect,	biz22_abort },
 #endif
 #if DF02
-	"df02",	df02_dialer,	df_disconnect,		df_abort,
+	{ "df02",	df02_dialer,	df_disconnect,		df_abort },
 #endif
 #if DF03
-	"df03",	df03_dialer,	df_disconnect,		df_abort,
+	{ "df03",	df03_dialer,	df_disconnect,		df_abort },
 #endif
 #if DN11
-	"dn11",	dn_dialer,	dn_disconnect,		dn_abort,
+	{ "dn11",	dn_dialer,	dn_disconnect,		dn_abort },
 #endif
 #ifdef VENTEL
-	"ventel",ven_dialer,	ven_disconnect,		ven_abort,
+	{ "ventel",	ven_dialer,	ven_disconnect,		ven_abort },
 #endif
 #ifdef HAYES
-	"hayes",hay_dialer,	hay_disconnect,		hay_abort,
+	{ "hayes",	hay_dialer,	hay_disconnect,		hay_abort },
 #endif
 #ifdef COURIER
-	"courier",cour_dialer,	cour_disconnect,	cour_abort,
+	{ "courier",	cour_dialer,	cour_disconnect,	cour_abort },
 #endif
 #ifdef T3000
-	"t3000",t3000_dialer,	t3000_disconnect,	t3000_abort,
+	{ "t3000",	t3000_dialer,	t3000_disconnect,	t3000_abort },
 #endif
 #ifdef V3451
 #ifndef V831
-	"vadic",v3451_dialer,	v3451_disconnect,	v3451_abort,
+	{ "vadic",	v3451_dialer,	v3451_disconnect,	v3451_abort },
 #endif
-	"v3451",v3451_dialer,	v3451_disconnect,	v3451_abort,
+	{ "v3451",	v3451_dialer,	v3451_disconnect,	v3451_abort },
 #endif
 #ifdef V831
 #ifndef V3451
-	"vadic",v831_dialer,	v831_disconnect,	v831_abort,
+	{ "vadic",	v831_dialer,	v831_disconnect,	v831_abort },
 #endif
-	"v831",v831_dialer,	v831_disconnect,	v831_abort,
+	{ "v831",	v831_dialer,	v831_disconnect,	v831_abort },
 #endif
-	0,	0,		0,			0
+	{ 0,		0,		0,			0 }
 };
 
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 07d7f51f08d..3fc7dbd30b9 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.13 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.14 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: cmds.c,v 1.13 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cmds.c,v 1.14 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
@@ -735,7 +735,7 @@ prtime(s, a)
 	}
 	printf("%s", s);
 	while (--i >= 0)
-		if (nums[i] || i == 0 && nums[1] == 0 && nums[2] == 0)
+		if (nums[i] || (i == 0 && nums[1] == 0 && nums[2] == 0))
 			printf("%d %s%c ", nums[i], sep[i],
 				nums[i] == 1 ? '\0' : 's');
 	printf("\r\n!\r\n");
diff --git a/usr.bin/tip/cmdtab.c b/usr.bin/tip/cmdtab.c
index 7f77e277774..87653e0d1b7 100644
--- a/usr.bin/tip/cmdtab.c
+++ b/usr.bin/tip/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmdtab.c,v 1.3 2001/09/09 17:58:41 millert Exp $	*/
+/*	$OpenBSD: cmdtab.c,v 1.4 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.3 2001/09/09 17:58:41 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.4 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index dacbf01c22d..adc990d908a 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cu.c,v 1.11 2002/02/10 23:22:10 miod Exp $	*/
+/*	$OpenBSD: cu.c,v 1.12 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cu.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: cu.c,v 1.11 2002/02/10 23:22:10 miod Exp $";
+static const char rcsid[] = "$OpenBSD: cu.c,v 1.12 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/hunt.c b/usr.bin/tip/hunt.c
index 60aaa235095..04b9913e769 100644
--- a/usr.bin/tip/hunt.c
+++ b/usr.bin/tip/hunt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hunt.c,v 1.8 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: hunt.c,v 1.9 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: hunt.c,v 1.6 1997/04/20 00:02:10 mellon Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)hunt.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: hunt.c,v 1.8 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: hunt.c,v 1.9 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/log.c b/usr.bin/tip/log.c
index 1a715c0d5f5..b2497613cda 100644
--- a/usr.bin/tip/log.c
+++ b/usr.bin/tip/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.5 2001/09/09 19:30:49 millert Exp $	*/
+/*	$OpenBSD: log.c,v 1.6 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: log.c,v 1.4 1994/12/24 17:56:28 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: log.c,v 1.5 2001/09/09 19:30:49 millert Exp $";
+static const char rcsid[] = "$OpenBSD: log.c,v 1.6 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/partab.c b/usr.bin/tip/partab.c
index b0e4dc2f732..7c0ab3c4333 100644
--- a/usr.bin/tip/partab.c
+++ b/usr.bin/tip/partab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: partab.c,v 1.3 1997/04/02 01:47:02 millert Exp $	*/
+/*	$OpenBSD: partab.c,v 1.4 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: partab.c,v 1.4 1996/12/29 10:38:21 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)partab.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: partab.c,v 1.3 1997/04/02 01:47:02 millert Exp $";
+static const char rcsid[] = "$OpenBSD: partab.c,v 1.4 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/remote.c b/usr.bin/tip/remote.c
index f2aaeb24352..ebff8cee51a 100644
--- a/usr.bin/tip/remote.c
+++ b/usr.bin/tip/remote.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: remote.c,v 1.10 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: remote.c,v 1.11 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: remote.c,v 1.5 1997/04/20 00:02:45 mellon Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
@@ -45,7 +45,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)remote.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: remote.c,v 1.10 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: remote.c,v 1.11 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -93,8 +93,8 @@ getremcap(host)
 	}
 
 	if ((stat = cgetent(&bp, db_array, host)) < 0) {
-		if (DV ||
-		    host[0] == '/' && access(DV = host, R_OK | W_OK) == 0) {
+		if ((DV != NULL) ||
+		    (host[0] == '/' && access(DV = host, R_OK | W_OK) == 0)) {
 			CU = DV;
 			HO = host;
 			HW = 1;
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index c96ab26376f..dddf296f320 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tip.c,v 1.17 2002/03/25 16:41:36 deraadt Exp $	*/
+/*	$OpenBSD: tip.c,v 1.18 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $	*/
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)tip.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: tip.c,v 1.17 2002/03/25 16:41:36 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: tip.c,v 1.18 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 /*
@@ -631,5 +631,5 @@ setparity(defparity)
 		(void) fflush(stderr);
 	}
 	for (i = 0; i < 0200; i++)
-		partab[i] = (evenpartab[i] ^ flip | set) & clr;
+		partab[i] = ((evenpartab[i] ^ flip) | set) & clr;
 }
diff --git a/usr.bin/tip/tipout.c b/usr.bin/tip/tipout.c
index d1ff53cdc0b..3be2541dde3 100644
--- a/usr.bin/tip/tipout.c
+++ b/usr.bin/tip/tipout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tipout.c,v 1.8 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: tipout.c,v 1.9 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: tipout.c,v 1.5 1996/12/29 10:34:12 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tipout.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: tipout.c,v 1.8 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: tipout.c,v 1.9 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/uucplock.c b/usr.bin/tip/uucplock.c
index a2a703b9edb..406bde54a62 100644
--- a/usr.bin/tip/uucplock.c
+++ b/usr.bin/tip/uucplock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uucplock.c,v 1.6 1998/07/13 02:11:44 millert Exp $	*/
+/*	$OpenBSD: uucplock.c,v 1.7 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: uucplock.c,v 1.7 1997/02/11 09:24:08 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: uucplock.c,v 1.6 1998/07/13 02:11:44 millert Exp $";
+static const char rcsid[] = "$OpenBSD: uucplock.c,v 1.7 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/value.c b/usr.bin/tip/value.c
index 20817e9cdff..8a11781c377 100644
--- a/usr.bin/tip/value.c
+++ b/usr.bin/tip/value.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: value.c,v 1.7 2001/10/24 18:38:58 millert Exp $	*/
+/*	$OpenBSD: value.c,v 1.8 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: value.c,v 1.6 1997/02/11 09:24:09 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)value.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: value.c,v 1.7 2001/10/24 18:38:58 millert Exp $";
+static const char rcsid[] = "$OpenBSD: value.c,v 1.8 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/vars.c b/usr.bin/tip/vars.c
index 6131dd29f97..ad2bcbf41b7 100644
--- a/usr.bin/tip/vars.c
+++ b/usr.bin/tip/vars.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vars.c,v 1.2 1996/06/26 05:40:50 deraadt Exp $	*/
+/*	$OpenBSD: vars.c,v 1.3 2002/05/07 06:56:50 hugh Exp $	*/
 /*	$NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: vars.c,v 1.2 1996/06/26 05:40:50 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: vars.c,v 1.3 2002/05/07 06:56:50 hugh Exp $";
 #endif /* not lint */
 
 #include "tip.h"