kill more registers

millert@ ok

322 files changed, 2967 insertions, 2966 deletions

diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index 114867c4e15..0142bd30d4d 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: banner.c,v 1.4 2001/06/21 16:35:18 lebel Exp $	*/
+/*	$OpenBSD: banner.c,v 1.5 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: banner.c,v 1.2 1995/04/09 06:00:15 cgd Exp $	*/
 
 /*
@@ -62,7 +62,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)printjob.c	8.2 (Berkeley) 4/16/94";
 #else
-static char rcsid[] = "$OpenBSD: banner.c,v 1.4 2001/06/21 16:35:18 lebel Exp $";
+static char rcsid[] = "$OpenBSD: banner.c,v 1.5 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -79,8 +79,8 @@ static long PW = LINELEN;
 
 static char *
 scnline(key, p, c)
-	register int key;
-	register char *p;
+	int key;
+	char *p;
 	int c;
 {
 	int scnwidth;
diff --git a/usr.bin/bdes/bdes.c b/usr.bin/bdes/bdes.c
index af26b6ebda1..e44383ade81 100644
--- a/usr.bin/bdes/bdes.c
+++ b/usr.bin/bdes/bdes.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bdes.c,v 1.5 2001/02/05 08:38:23 deraadt Exp $	*/
+/*	$OpenBSD: bdes.c,v 1.6 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: bdes.c,v 1.2 1995/03/26 03:33:19 glass Exp $	*/
 
 /*-
@@ -51,7 +51,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)bdes.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: bdes.c,v 1.5 2001/02/05 08:38:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: bdes.c,v 1.6 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -191,8 +191,8 @@ main(ac, av)
 {
 	extern int optind;		/* option (argument) number */
 	extern char *optarg;		/* argument to option if any */
-	register int i;			/* counter in a for loop */
-	register char *p;		/* used to obtain the key */
+	int i;				/* counter in a for loop */
+	char *p;			/* used to obtain the key */
 	Desbuf msgbuf;			/* I/O buffer */
 	int kflag;			/* command-line encryptiooon key */
 	int argc;			/* the real arg count */
@@ -395,7 +395,7 @@ cvtkey(obuf, ibuf)
 	char *obuf;			/* bit pattern */
 	char *ibuf;			/* the key itself */
 {
-	register int i, j;		/* counter in a for loop */
+	int i, j;			/* counter in a for loop */
 	int nbuf[64];			/* used for hex/key translation */
 
 	/*
@@ -464,8 +464,8 @@ setbits(s, mult)
 	char *s;			/* the ASCII string */
 	int mult;			/* what it must be a multiple of */
 {
-	register char *p;		/* pointer in a for loop */
-	register int n = 0;		/* the integer collected */
+	char *p;			/* pointer in a for loop */
+	int n = 0;			/* the integer collected */
 
 	/*
 	 * skip white space
@@ -506,8 +506,8 @@ void
 makekey(buf)
 	Desbuf buf;				/* key block */
 {
-	register int i, j;			/* counter in a for loop */
-	register int par;			/* parity counter */
+	int i, j;				/* counter in a for loop */
+	int par;				/* parity counter */
 
 	/*
 	 * if the parity is not preserved, flip it
@@ -534,8 +534,8 @@ makekey(buf)
 void
 ecbenc()
 {
-	register int n;		/* number of bytes actually read */
-	register int bn;	/* block number */
+	int n;			/* number of bytes actually read */
+	int bn;			/* block number */
 	Desbuf msgbuf;		/* I/O buffer */
 
 	for (bn = 0; (n = READ(BUFFER(msgbuf),  8)) == 8; bn++) {
@@ -563,9 +563,9 @@ ecbenc()
 void
 ecbdec()
 {
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int bn;	/* block number */
+	int n;			/* number of bytes actually read */
+	int c;			/* used to test for EOF */
+	int bn;			/* block number */
 	Desbuf msgbuf;		/* I/O buffer */
 
 	for (bn = 1; (n = READ(BUFFER(msgbuf), 8)) == 8; bn++) {
@@ -595,8 +595,8 @@ ecbdec()
 void
 cbcenc()
 {
-	register int n;		/* number of bytes actually read */
-	register int bn;	/* block number */
+	int n;			/* number of bytes actually read */
+	int bn;			/* block number */
 	Desbuf msgbuf;		/* I/O buffer */
 
 	/*
@@ -629,11 +629,11 @@ cbcenc()
 void
 cbcdec()
 {
-	register int n;		/* number of bytes actually read */
+	int n;			/* number of bytes actually read */
 	Desbuf msgbuf;		/* I/O buffer */
 	Desbuf ibuf;		/* temp buffer for initialization vector */
-	register int c;		/* used to test for EOF */
-	register int bn;	/* block number */
+	int c;			/* used to test for EOF */
+	int bn;			/* block number */
 
 	for (bn = 0; (n = READ(BUFFER(msgbuf), 8)) == 8; bn++) {
 		/*
@@ -666,7 +666,7 @@ cbcdec()
 void
 cbcauth()
 {
-	register int n, j;		/* number of bytes actually read */
+	int n, j;		/* number of bytes actually read */
 	Desbuf msgbuf;		/* I/O buffer */
 	Desbuf encbuf;		/* encryption buffer */
 
@@ -711,9 +711,9 @@ cbcauth()
 void
 cfbenc()
 {
-	register int n;		/* number of bytes actually read */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
+	int n;			/* number of bytes actually read */
+	int nbytes;		/* number of bytes to read */
+	int bn;			/* block number */
 	char ibuf[8];		/* input buffer */
 	Desbuf msgbuf;		/* encryption buffer */
 
@@ -753,10 +753,10 @@ cfbenc()
 void
 cfbdec()
 {
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
+	int n;			/* number of bytes actually read */
+	int c;			/* used to test for EOF */
+	int nbytes;		/* number of bytes to read */
+	int bn;			/* block number */
 	char ibuf[8];		/* input buffer */
 	char obuf[8];		/* output buffer */
 	Desbuf msgbuf;		/* encryption buffer */
@@ -799,9 +799,9 @@ cfbdec()
 void
 cfbaenc()
 {
-	register int n;		/* number of bytes actually read */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
+	int n;			/* number of bytes actually read */
+	int nbytes;		/* number of bytes to read */
+	int bn;			/* block number */
 	char ibuf[8];		/* input buffer */
 	char obuf[8];		/* output buffer */
 	Desbuf msgbuf;		/* encryption buffer */
@@ -845,10 +845,10 @@ cfbaenc()
 void
 cfbadec()
 {
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
+	int n;			/* number of bytes actually read */
+	int c;			/* used to test for EOF */
+	int nbytes;		/* number of bytes to read */
+	int bn;			/* block number */
 	char ibuf[8];		/* input buffer */
 	char obuf[8];		/* output buffer */
 	Desbuf msgbuf;		/* encryption buffer */
@@ -892,10 +892,10 @@ cfbadec()
 void
 ofbenc()
 {
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
+	int n;			/* number of bytes actually read */
+	int c;			/* used to test for EOF */
+	int nbytes;		/* number of bytes to read */
+	int bn;			/* block number */
 	char ibuf[8];		/* input buffer */
 	char obuf[8];		/* output buffer */
 	Desbuf msgbuf;		/* encryption buffer */
@@ -938,10 +938,10 @@ ofbenc()
 void
 ofbdec()
 {
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
+	int n;			/* number of bytes actually read */
+	int c;			/* used to test for EOF */
+	int nbytes;		/* number of bytes to read */
+	int bn;			/* block number */
 	char ibuf[8];		/* input buffer */
 	char obuf[8];		/* output buffer */
 	Desbuf msgbuf;		/* encryption buffer */
@@ -987,8 +987,8 @@ ofbdec()
 void
 cfbauth()
 {
-	register int n, j;	/* number of bytes actually read */
-	register int nbytes;	/* number of bytes to read */
+	int n, j;		/* number of bytes actually read */
+	int nbytes;		/* number of bytes to read */
 	char ibuf[8];		/* input buffer */
 	Desbuf msgbuf;		/* encryption buffer */
 
@@ -1040,7 +1040,7 @@ expand(from, to)
 	Desbuf from;			/* 8bit/unsigned char string */
 	char *to;			/* 1bit/char string */
 {
-	register int i, j;		/* counters in for loop */
+	int i, j;			/* counters in for loop */
 
 	for (i = 0; i < 8; i++)
 		for (j = 0; j < 8; j++)
@@ -1054,7 +1054,7 @@ compress(from, to)
 	char *from;			/* 1bit/char string */
 	Desbuf to;			/* 8bit/unsigned char string */
 {
-	register int i, j;		/* counters in for loop */
+	int i, j;			/* counters in for loop */
 
 	for (i = 0; i < 8; i++) {
 	 	CHAR(to, i) = 0;
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 3ac361ea53e..71f35e01d4f 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: day.c,v 1.13 2001/09/27 18:19:20 mickey Exp $	*/
+/*	$OpenBSD: day.c,v 1.14 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -43,7 +43,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: day.c,v 1.13 2001/09/27 18:19:20 mickey Exp $";
+static char rcsid[] = "$OpenBSD: day.c,v 1.14 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -565,9 +565,9 @@ isnow(endp, bodun)
 
 int
 getmonth(s)
-	register char *s;
+	char *s;
 {
-	register char **p;
+	char **p;
 	struct fixs *n;
 
 	for (n = fnmonths; n->name; ++n)
@@ -585,9 +585,9 @@ getmonth(s)
 
 int
 getday(s)
-	register char *s;
+	char *s;
 {
-	register char **p;
+	char **p;
 	struct fixs *n;
 
 	for (n = fndays; n->name; ++n)
@@ -609,9 +609,9 @@ getday(s)
  */
 int
 getdayvar(s)
-	register char *s;
+	char *s;
 {
-	register int offset;
+	int offset;
 
 
 	offset = strlen(s);
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 0b864709db7..f05a3b8b995 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.18 2001/10/03 18:17:48 deraadt Exp $	*/
+/*	$OpenBSD: io.c,v 1.19 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -43,7 +43,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: io.c,v 1.18 2001/10/03 18:17:48 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: io.c,v 1.19 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -84,8 +84,8 @@ struct iovec header[] = {
 void
 cal()
 {
-	register int printing;
-	register char *p;
+	int printing;
+	char *p;
 	FILE *fp;
 	int ch, l, i, bodun = 0, bodun_maybe = 0;
 	int var;
diff --git a/usr.bin/cap_mkdb/getinfo.c b/usr.bin/cap_mkdb/getinfo.c
index 8ae425ea955..2a0457c9ba3 100644
--- a/usr.bin/cap_mkdb/getinfo.c
+++ b/usr.bin/cap_mkdb/getinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getinfo.c,v 1.3 2001/06/18 18:17:39 millert Exp $	*/
+/*	$OpenBSD: getinfo.c,v 1.4 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: getinfo.c,v 1.3 2001/06/18 18:17:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: getinfo.c,v 1.4 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -81,7 +81,7 @@ igetcap(buf, cap, type)
 	char *buf, *cap;
 	int type;
 {
-	register char *bp, *cp;
+	char *bp, *cp;
 
 	bp = buf;
 	for (;;) {
@@ -143,7 +143,7 @@ getent(cap, len, db_array, fd, name, depth)
 	u_int *len;
 	int fd, depth;
 {
-	register char *r_end, *rp, **db_p;
+	char *r_end, *rp, **db_p;
 	int myfd, eof, foundit;
 	char *record;
 	int tc_not_resolved;
@@ -193,8 +193,8 @@ getent(cap, len, db_array, fd, name, depth)
 		 */
 		{
 		char buf[BUFSIZ];
-		register char *b_end, *bp;
-		register int c;
+		char *b_end, *bp;
+		int c;
 
 		/*
 		 * Loop invariants:
@@ -321,8 +321,8 @@ getent(cap, len, db_array, fd, name, depth)
 	 * references in it ...
 	 */
 	{
-		register char *newicap, *s;
-		register int newilen;
+		char *newicap, *s;
+		int newilen;
 		u_int ilen;
 		int diff, iret, tclen;
 		char *icap, *scan, *tc, *tcstart, *tcend;
@@ -470,7 +470,7 @@ static int
 igetmatch(buf, name)
 	char *buf, *name;
 {
-	register char *np, *bp;
+	char *np, *bp;
 
 	/*
 	 * Start search at beginning of record.
@@ -528,7 +528,7 @@ igetclose()
  */
 int
 igetnext(bp, db_array)
-        register char **bp;
+        char **bp;
 	char **db_array;
 {
 	size_t len;
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index 84104d1d949..4ced281a7fd 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: checknr.c,v 1.6 2001/08/12 12:03:03 heko Exp $	*/
+/*	$OpenBSD: checknr.c,v 1.7 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: checknr.c,v 1.4 1995/03/26 04:10:19 glass Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)checknr.c	8.1 (Berkeley) 6/6/93";
 #else 
-static char rcsid[] = "$OpenBSD: checknr.c,v 1.6 2001/08/12 12:03:03 heko Exp $";
+static char rcsid[] = "$OpenBSD: checknr.c,v 1.7 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -288,7 +288,7 @@ void
 process(f)
 FILE *f;
 {
-	register int i, n;
+	int i, n;
 	char mac[5];	/* The current macro or nroff command */
 	int pl;
 
@@ -414,7 +414,7 @@ chkcmd(line, mac)
 char *line;
 char *mac;
 {
-	register int i;
+	int i;
 
 	/*
 	 * Check to see if it matches top of stack.
@@ -451,7 +451,7 @@ void
 nomatch(mac)
 char *mac;
 {
-	register int i, j;
+	int i, j;
 
 	/*
 	 * Look for a match further down on stack
@@ -565,7 +565,7 @@ void
 addmac(mac)
 char *mac;
 {
-	register char **src, **dest, **loc;
+	char **src, **dest, **loc;
 
 	if (binsrch(mac) >= 0){	/* it's OK to redefine something */
 #ifdef DEBUG
@@ -598,10 +598,10 @@ int
 binsrch(mac)
 char *mac;
 {
-	register char *p;	/* pointer to current cmd in list */
-	register int d;		/* difference if any */
-	register int mid;	/* mid point in binary search */
-	register int top, bot;	/* boundaries of bin search, inclusive */
+	char *p;		/* pointer to current cmd in list */
+	int d;			/* difference if any */
+	int mid;		/* mid point in binary search */
+	int top, bot;		/* boundaries of bin search, inclusive */
 
 	top = ncmds-1;
 	bot = 0;
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index 7ac233392ed..75f775b218d 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pw_yp.c,v 1.12 1999/12/15 21:31:42 deraadt Exp $	*/
+/*	$OpenBSD: pw_yp.c,v 1.13 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: pw_yp.c,v 1.5 1995/03/26 04:55:33 glass Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)pw_yp.c	1.0 2/2/93";
 #else
-static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.12 1999/12/15 21:31:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.13 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -177,7 +177,7 @@ pw_yp(pw, uid)
 
 static char *
 pwskip(p)
-	register char *p;
+	char *p;
 {
 	while (*p && *p != ':' && *p != '\n')
 		++p;
@@ -191,7 +191,7 @@ interpret(pwent, line)
 	struct passwd *pwent;
 	char *line;
 {
-	register char	*p = line;
+	char	*p = line;
 
 	pwent->pw_passwd = "*";
 	pwent->pw_uid = 0;
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 65ed5530c89..5165ef5a9c1 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cksum.c,v 1.6 2000/11/21 18:03:18 aaron Exp $	*/
+/*	$OpenBSD: cksum.c,v 1.7 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: cksum.c,v 1.7 1995/09/02 05:45:18 jtc Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif
-static char rcsid[] = "$OpenBSD: cksum.c,v 1.6 2000/11/21 18:03:18 aaron Exp $";
+static char rcsid[] = "$OpenBSD: cksum.c,v 1.7 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
@@ -73,7 +73,7 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register int ch, fd, rval;
+	int ch, fd, rval;
 	u_int32_t len, val;
 	char *fn;
 	int (*cfncn) __P((int, u_int32_t *, u_int32_t *));
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index 7301e342f50..7ac0b01efd5 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crc.c,v 1.2 1996/03/27 19:32:21 niklas Exp $	*/
+/*	$OpenBSD: crc.c,v 1.3 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: crc.c,v 1.7 1996/02/27 21:29:53 jtc Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 6/17/93";
 static char rcsid[] = "$NetBSD: crc.c,v 1.7 1996/02/27 21:29:53 jtc Exp $";
 #else
-static char rcsid[] = "$OpenBSD: crc.c,v 1.2 1996/03/27 19:32:21 niklas Exp $";
+static char rcsid[] = "$OpenBSD: crc.c,v 1.3 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -116,12 +116,12 @@ u_int32_t crc_total = ~0;		/* The crc over a number of files. */
 
 int
 crc(fd, cval, clen)
-	register int fd;
+	int fd;
 	u_int32_t *cval, *clen;
 {
-	register u_char *p;
-	register int nr;
-	register u_int32_t crc, len;
+	u_char *p;
+	int nr;
+	u_int32_t crc, len;
 	u_char buf[16 * 1024];
 
 #define	COMPUTE(var, ch)	(var) = (var) << 8 ^ crctab[(var) >> 24 ^ (ch)]
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index 73850d4829b..bc3fe79c790 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sum1.c,v 1.2 1996/03/27 19:32:22 niklas Exp $	*/
+/*	$OpenBSD: sum1.c,v 1.3 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: sum1.c,v 1.5 1996/02/27 21:17:27 cgd Exp $	*/
 
 /*-
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sum1.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] = "$NetBSD: sum1.c,v 1.5 1996/02/27 21:17:27 cgd Exp $";
 #else
-static char rcsid[] = "$OpenBSD: sum1.c,v 1.2 1996/03/27 19:32:22 niklas Exp $";
+static char rcsid[] = "$OpenBSD: sum1.c,v 1.3 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -50,13 +50,13 @@ static char rcsid[] = "$OpenBSD: sum1.c,v 1.2 1996/03/27 19:32:22 niklas Exp $";
 
 int
 csum1(fd, cval, clen)
-	register int fd;
+	int fd;
 	u_int32_t *cval, *clen;
 {
-	register u_int32_t total;
-	register int nr;
-	register u_int crc;
-	register u_char *p;
+	u_int32_t total;
+	int nr;
+	u_int crc;
+	u_char *p;
 	u_char buf[8192];
 
 	/*
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index d07b9740ce6..2af8d6806ec 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sum2.c,v 1.2 1996/03/27 19:32:23 niklas Exp $	*/
+/*	$OpenBSD: sum2.c,v 1.3 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: sum2.c,v 1.5 1996/02/27 21:17:28 cgd Exp $	*/
 
 /*-
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sum2.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] = "$NetBSD: sum2.c,v 1.5 1996/02/27 21:17:28 cgd Exp $";
 #else
-static char rcsid[] = "$OpenBSD: sum2.c,v 1.2 1996/03/27 19:32:23 niklas Exp $";
+static char rcsid[] = "$OpenBSD: sum2.c,v 1.3 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -50,12 +50,12 @@ static char rcsid[] = "$OpenBSD: sum2.c,v 1.2 1996/03/27 19:32:23 niklas Exp $";
 
 int
 csum2(fd, cval, clen)
-	register int fd;
+	int fd;
 	u_int32_t *cval, *clen;
 {
-	register u_int32_t crc, total;
-	register int nr;
-	register u_char *p;
+	u_int32_t crc, total;
+	int nr;
+	u_char *p;
 	u_char buf[8192];
 
 	/*
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index 74abe8ec321..055302ea1e9 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: colcrt.c,v 1.3 2001/07/12 05:16:59 deraadt Exp $	*/
+/*	$OpenBSD: colcrt.c,v 1.4 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: colcrt.c,v 1.3 1995/03/26 05:31:00 glass Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)colcrt.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: colcrt.c,v 1.3 2001/07/12 05:16:59 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: colcrt.c,v 1.4 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -88,8 +88,8 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register int c;
-	register char *cp, *dp;
+	int c;
+	char *cp, *dp;
 
 	argc--;
 	progname = *argv++;
@@ -211,8 +211,8 @@ void
 pflush(ol)
 	int ol;
 {
-	register int i;
-	register char *cp;
+	int i;
+	char *cp;
 	char lastomit;
 	int l;
 
@@ -246,7 +246,7 @@ void
 move(l, m)
 	int l, m;
 {
-	register char *cp, *dp;
+	char *cp, *dp;
 
 	for (cp = page[l], dp = page[m]; *cp; cp++, dp++) {
 		switch (*cp) {
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 59ca5a668c8..9d643cefc43 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: colrm.c,v 1.4 2001/07/12 05:16:59 deraadt Exp $	*/
+/*	$OpenBSD: colrm.c,v 1.5 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: colrm.c,v 1.4 1995/09/02 05:51:37 jtc Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)colrm.c	8.2 (Berkeley) 5/4/95";
 #endif
-static char rcsid[] = "$OpenBSD: colrm.c,v 1.4 2001/07/12 05:16:59 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: colrm.c,v 1.5 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -67,8 +67,8 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register u_long column, start, stop;
-	register int ch;
+	u_long column, start, stop;
+	int ch;
 	char *p;
 
 	while ((ch = getopt(argc, argv, "")) != -1)
diff --git a/usr.bin/compress/gzopen.c b/usr.bin/compress/gzopen.c
index 4f4277dc82c..8e7ed269d0e 100644
--- a/usr.bin/compress/gzopen.c
+++ b/usr.bin/compress/gzopen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gzopen.c,v 1.1 1997/07/06 20:22:57 mickey Exp $	*/
+/*	$OpenBSD: gzopen.c,v 1.2 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -96,10 +96,10 @@ struct gz_stream {
 
 static u_char gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
 
-static int put_int32 __P((register gz_stream *, u_int32_t));
-static u_int32_t get_int32 __P((register gz_stream *));
-static int get_header __P((register gz_stream *));
-static int get_byte __P((register gz_stream *));
+static int put_int32 __P((gz_stream *, u_int32_t));
+static u_int32_t get_int32 __P((gz_stream *));
+static int get_header __P((gz_stream *));
+static int get_byte __P((gz_stream *));
 
 int
 gz_check_header(fd, sb, ofn)
@@ -197,7 +197,7 @@ int
 gz_close (cookie)
 	void *cookie;
 {
-	register gz_stream *s = (gz_stream*)cookie;
+	gz_stream *s = (gz_stream*)cookie;
 	int err = 0;
 
 	if (s == NULL)
@@ -225,7 +225,7 @@ gz_flush (cookie, flush)
     void *cookie;
     int flush;
 {
-	register gz_stream *s = (gz_stream*)cookie;
+	gz_stream *s = (gz_stream*)cookie;
 	size_t len;
 	int done = 0;
 	int err;
@@ -262,7 +262,7 @@ gz_flush (cookie, flush)
 
 static int
 put_int32 (s, x)
-	register gz_stream *s;
+	gz_stream *s;
 	u_int32_t x;
 {
 	if (write(s->z_fd, &x, 1) != 1)
@@ -281,7 +281,7 @@ put_int32 (s, x)
 
 static int
 get_byte(s)
-	register gz_stream *s;
+	gz_stream *s;
 {
 	if (s->z_eof)
 		return EOF;
@@ -301,9 +301,9 @@ get_byte(s)
 
 static u_int32_t 
 get_int32 (s)
-	register gz_stream *s;
+	gz_stream *s;
 {
-	register u_int32_t x;
+	u_int32_t x;
 
 	x  = ((u_int32_t)(get_byte(s) & 0xff));
 	x |= ((u_int32_t)(get_byte(s) & 0xff))<<8;
@@ -314,7 +314,7 @@ get_int32 (s)
 
 static int
 get_header(s)
-	register gz_stream *s;
+	gz_stream *s;
 {
 	int method; /* method byte */
 	int flags;  /* flags byte */
@@ -375,7 +375,7 @@ gz_read(cookie, buf, len)
 	char *buf;
 	int len;
 {
-	register gz_stream *s = (gz_stream*)cookie;
+	gz_stream *s = (gz_stream*)cookie;
 	u_char *start = buf; /* starting point for crc computation */
 
 	s->z_stream.next_out = buf;
@@ -419,7 +419,7 @@ gz_write(cookie, buf, len)
 	const char *buf;
 	int len;
 {
-	register gz_stream *s = (gz_stream*)cookie;
+	gz_stream *s = (gz_stream*)cookie;
 
 	s->z_stream.next_in = (char *)buf;
 	s->z_stream.avail_in = len;
diff --git a/usr.bin/compress/main.c b/usr.bin/compress/main.c
index 8f20e3c0847..dd6be0407f0 100644
--- a/usr.bin/compress/main.c
+++ b/usr.bin/compress/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.15 2000/12/12 16:23:27 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.16 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.15 2000/12/12 16:23:27 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.16 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -84,9 +84,9 @@ int permission __P((char *));
 void setfile __P((char *, struct stat *));
 void usage __P((void));
 int compress
-	__P((const char *, const char *, register struct compressor *, int));
+	__P((const char *, const char *, struct compressor *, int));
 int decompress
-	__P((const char *, const char *, register struct compressor *, int));
+	__P((const char *, const char *, struct compressor *, int));
 struct compressor *check_method __P((int, const char *));
 
 struct stat sb, osb;
@@ -325,13 +325,13 @@ int
 compress(in, out, method, bits)
 	const char *in;
 	const char *out;
-	register struct compressor *method;
+	struct compressor *method;
 	int bits;
 {
-	register int ifd;
+	int ifd;
 	int ofd;
-	register void *cookie;
-	register ssize_t nr;
+	void *cookie;
+	ssize_t nr;
 	u_char buf[Z_BUFSIZE];
 	int error;
 
@@ -384,7 +384,7 @@ check_method(fd, out)
 	int fd;
 	const char *out;
 {
-	register struct compressor *method;
+	struct compressor *method;
 
 	for (method = &c_table[0];
 	     method->name != NULL &&
@@ -402,13 +402,13 @@ int
 decompress(in, out, method, bits)
 	const char *in;
 	const char *out;
-	register struct compressor *method;
+	struct compressor *method;
 	int bits;
 {
 	int ifd;
-	register int ofd;
-	register void *cookie;
-	register ssize_t nr;
+	int ofd;
+	void *cookie;
+	ssize_t nr;
 	u_char buf[Z_BUFSIZE];
 	int error;
 
@@ -467,7 +467,7 @@ decompress(in, out, method, bits)
 void
 setfile(name, fs)
 	char *name;
-	register struct stat *fs;
+	struct stat *fs;
 {
 	static struct timeval tv[2];
 
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 12146d65bf0..3d3f416e3c5 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zopen.c,v 1.6 1999/03/04 15:04:45 mickey Exp $	*/
+/*	$OpenBSD: zopen.c,v 1.7 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: zopen.c,v 1.5 1995/03/26 09:44:53 glass Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)zopen.c	8.1 (Berkeley) 6/27/93";
 #else
-static char rcsid[] = "$OpenBSD: zopen.c,v 1.6 1999/03/04 15:04:45 mickey Exp $";
+static char rcsid[] = "$OpenBSD: zopen.c,v 1.7 2001/11/19 19:02:13 mpech Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -185,10 +185,10 @@ struct s_zstate {
 #define	FIRST	257		/* First free entry. */
 #define	CLEAR	256		/* Table clear output code. */
 
-static int	cl_block __P((register struct s_zstate *));
-static void	cl_hash __P((register struct s_zstate *, register count_int));
-static code_int	getcode __P((register struct s_zstate *));
-static int	output __P((register struct s_zstate *, code_int));
+static int	cl_block __P((struct s_zstate *));
+static void	cl_hash __P((struct s_zstate *, register count_int));
+static code_int	getcode __P((struct s_zstate *));
+static int	output __P((struct s_zstate *, code_int));
 
 /*-
  * Algorithm from "A Technique for High Performance Data Compression",
@@ -222,8 +222,8 @@ zwrite(cookie, wbp, num)
 	const char *wbp;
 	int num;
 {
-	register code_int i;
-	register int c, disp;
+	code_int i;
+	int c, disp;
 	struct s_zstate *zs;
 	const u_char *bp;
 	u_char tmp;
@@ -364,14 +364,14 @@ static const u_char rmask[9] =
 
 static int
 output(zs, ocode)
-	register struct s_zstate *zs;
+	struct s_zstate *zs;
 	code_int ocode;
 {
-	register int bits;
+	int bits;
 
 	if (ocode >= 0) {
-		register int r_off;
-		register u_char *bp;
+		int r_off;
+		u_char *bp;
 
 		/* Get to the first byte. */
 		bp = zs->zs_bp + (zs->zs_offset >> 3);
@@ -466,7 +466,7 @@ zread(cookie, rbp, num)
 	char *rbp;
 	int num;
 {
-	register u_int count;
+	u_int count;
 	struct s_zstate *zs;
 	u_char *bp, header[3];
 
@@ -574,11 +574,11 @@ eof:	return (num - count);
  */
 static code_int
 getcode(zs)
-	register struct s_zstate *zs;
+	struct s_zstate *zs;
 {
-	register code_int gcode;
-	register int r_off, bits;
-	register u_char *bp;
+	code_int gcode;
+	int r_off, bits;
+	u_char *bp;
 
 	if (zs->zs_clear_flg > 0 || zs->zs_offset >= zs->zs_size ||
 	    zs->zs_free_ent > zs->zs_maxcode) {
@@ -648,9 +648,9 @@ getcode(zs)
 
 static int
 cl_block(zs)			/* Table clear for block compress. */
-	register struct s_zstate *zs;
+	struct s_zstate *zs;
 {
-	register long rat;
+	long rat;
 
 	zs->zs_checkpoint = zs->zs_in_count + CHECK_GAP;
 
@@ -677,11 +677,11 @@ cl_block(zs)			/* Table clear for block compress. */
 
 static void
 cl_hash(zs, cl_hsize)			/* Reset code table. */
-	register struct s_zstate *zs;
-	register count_int cl_hsize;
+	struct s_zstate *zs;
+	count_int cl_hsize;
 {
-	register count_int *htab_p;
-	register long i, m1;
+	count_int *htab_p;
+	long i, m1;
 
 	m1 = -1;
 	htab_p = zs->zs_htab + cl_hsize;
@@ -734,7 +734,7 @@ z_open(fd, mode, bits)
 	const char *mode;
 	int bits;
 {
-	register struct s_zstate *zs;
+	struct s_zstate *zs;
 
 	if ((mode[0] != 'r' && mode[0] != 'w') || mode[1] != '\0' ||
 	    bits < 0 || bits > BITS) {
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index 4aa89e0cfe9..dce652e164e 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cut.c,v 1.7 2000/06/04 23:52:19 aaron Exp $	*/
+/*	$OpenBSD: cut.c,v 1.8 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)cut.c	8.3 (Berkeley) 5/4/95";
 #endif
-static char rcsid[] = "$OpenBSD: cut.c,v 1.7 2000/06/04 23:52:19 aaron Exp $";
+static char rcsid[] = "$OpenBSD: cut.c,v 1.8 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -141,8 +141,8 @@ void
 get_list(list)
 	char *list;
 {
-	register int setautostart, start, stop;
-	register char *pos;
+	int setautostart, start, stop;
+	char *pos;
 	char *p;
 
 	/*
@@ -201,8 +201,8 @@ c_cut(fp, fname)
 	FILE *fp;
 	char *fname;
 {
-	register int ch, col;
-	register char *pos;
+	int ch, col;
+	char *pos;
 
 	for (;;) {
 		pos = positions + 1;
@@ -231,8 +231,8 @@ f_cut(fp, fname)
 	FILE *fp;
 	char *fname;
 {
-	register int ch, field, isdelim;
-	register char *pos, *p, sep;
+	int ch, field, isdelim;
+	char *pos, *p, sep;
 	int output;
 	size_t len;
 	char *lbuf, *tbuf;
diff --git a/usr.bin/elf2olf/elf2olf.c b/usr.bin/elf2olf/elf2olf.c
index 4adc68ae0a7..13e968218ee 100644
--- a/usr.bin/elf2olf/elf2olf.c
+++ b/usr.bin/elf2olf/elf2olf.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: elf2olf.c,v 1.5 2001/07/12 05:17:01 deraadt Exp $	*/
+/*      $OpenBSD: elf2olf.c,v 1.6 2001/11/19 19:02:13 mpech Exp $	*/
 /*
  * Copyright (c) 1996 Erik Theisen.  All rights reserved.
  *
@@ -30,7 +30,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.5 2001/07/12 05:17:01 deraadt Exp $";
+static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.6 2001/11/19 19:02:13 mpech Exp $";
 #endif
 
 #include <stdlib.h>
@@ -67,10 +67,10 @@ main(int argc, char*argv[])
 {
     extern char *optarg;
     extern int optind;
-    register int ch, i, okay;
+    int ch, i, okay;
     char *opstring;
 
-    register int fd;
+    int fd;
     struct stat st;
     Elf32_Ehdr ehdr;
     Elf32_Shdr shdr;
@@ -238,7 +238,7 @@ pwarn(name, fname, errval)
 void
 usage()
 {
-    register int i;
+    int i;
     int col = 8;
 
     if (olf2elf) {
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 1e60c6fbefb..2622d097b78 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expand.c,v 1.3 1998/01/22 17:41:09 deraadt Exp $	*/
+/*	$OpenBSD: expand.c,v 1.4 2001/11/19 19:02:13 mpech Exp $	*/
 /*	$NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #endif
-static char rcsid[] = "$OpenBSD: expand.c,v 1.3 1998/01/22 17:41:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: expand.c,v 1.4 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -66,8 +66,8 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register int c, column;
-	register int n;
+	int c, column;
+	int n;
 
 	/* handle obsolete syntax */
 	while (argc > 1 && argv[1][0] == '-' && isdigit(argv[1][1])) {
@@ -152,9 +152,9 @@ main(argc, argv)
 
 static void
 getstops(cp)
-	register char *cp;
+	char *cp;
 {
-	register int i;
+	int i;
 
 	nstops = 0;
 	for (;;) {
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 195b254ca13..29fa9781d7a 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apprentice.c,v 1.10 2000/06/30 16:00:13 millert Exp $	*/
+/*	$OpenBSD: apprentice.c,v 1.11 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*
  * apprentice - make one pass through /etc/magic, learning its secrets.
@@ -36,7 +36,7 @@
 #include "file.h"
 
 #ifndef	lint
-static char *moduleid = "$OpenBSD: apprentice.c,v 1.10 2000/06/30 16:00:13 millert Exp $";
+static char *moduleid = "$OpenBSD: apprentice.c,v 1.11 2001/11/19 19:02:13 mpech Exp $";
 #endif	/* lint */
 
 #define	EATAB {while (isascii((unsigned char) *l) && \
@@ -425,14 +425,14 @@ char **p;
  */
 static char *
 getstr(s, p, plen, slen)
-register char	*s;
-register char	*p;
+char	*s;
+char	*p;
 int	plen, *slen;
 {
 	char	*origs = s, *origp = p;
 	char	*pmax = p + plen - 1;
-	register int	c;
-	register int	val;
+	int	c;
+	int	val;
 
 	while ((c = *s++) != '\0') {
 		if (isspace((unsigned char) c))
@@ -547,7 +547,7 @@ FILE *fp;
 const char *s;
 int len;
 {
-	register char	c;
+	char	c;
 
 	for (;;) {
 		c = *s++;
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index 73958d23773..75de0fa045c 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ascmagic.c,v 1.4 1998/07/10 15:05:15 mickey Exp $	*/
+/*	$OpenBSD: ascmagic.c,v 1.5 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*
  * ASCII magic -- file types that we know based on keywords
@@ -38,7 +38,7 @@
 #include "names.h"
 
 #ifndef	lint
-static char *moduleid = "$OpenBSD: ascmagic.c,v 1.4 1998/07/10 15:05:15 mickey Exp $";
+static char *moduleid = "$OpenBSD: ascmagic.c,v 1.5 2001/11/19 19:02:13 mpech Exp $";
 #endif	/* lint */
 
 			/* an optimisation over plain strcmp() */
@@ -53,7 +53,7 @@ int nbytes;	/* size actually read */
 	unsigned char *s;
 	char nbuf[HOWMANY+1];	/* one extra for terminating '\0' */
 	char *token;
-	register struct names *p;
+	struct names *p;
 
 	/*
 	 * Do the tar test first, because if the first file in the tar
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index b6808a83fdf..19175af6df6 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsmagic.c,v 1.5 1999/12/06 00:32:29 deraadt Exp $	*/
+/*	$OpenBSD: fsmagic.c,v 1.6 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*
  * fsmagic - magic based on filesystem info - directory, special files, etc.
@@ -53,7 +53,7 @@
 #include "file.h"
 
 #ifndef	lint
-static char *moduleid = "$OpenBSD: fsmagic.c,v 1.5 1999/12/06 00:32:29 deraadt Exp $";
+static char *moduleid = "$OpenBSD: fsmagic.c,v 1.6 2001/11/19 19:02:13 mpech Exp $";
 #endif	/* lint */
 
 int
@@ -108,7 +108,7 @@ struct stat *sb;
 	case S_IFLNK:
 		{
 			char buf[BUFSIZ+4];
-			register int nch;
+			int nch;
 			struct stat tstatbuf;
 
 			if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) {
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index ec10f41e9bf..f6a7ad4c682 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: is_tar.c,v 1.3 1997/02/09 23:58:27 millert Exp $	*/
+/*	$OpenBSD: is_tar.c,v 1.4 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*
  * is_tar() -- figure out whether file is a tar archive.
@@ -36,10 +36,10 @@ is_tar(buf, nbytes)
 unsigned char *buf;
 int nbytes;
 {
-	register union record *header = (union record *)buf;
-	register int	i;
-	register int	sum, recsum;
-	register char	*p;
+	union record *header = (union record *)buf;
+	int	i;
+	int	sum, recsum;
+	char	*p;
 
 	if (nbytes < sizeof(union record))
 		return 0;
@@ -78,10 +78,10 @@ int nbytes;
  */
 static int
 from_oct(digs, where)
-	register int	digs;
-	register char	*where;
+	int	digs;
+	char	*where;
 {
-	register int	value;
+	int	value;
 
 	while (isspace(*where)) {		/* Skip spaces */
 		where++;
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 40bbd124b70..ed222bbd653 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softmagic.c,v 1.4 1998/07/10 15:05:27 mickey Exp $	*/
+/*	$OpenBSD: softmagic.c,v 1.5 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*
  * softmagic - interpret variable magic from /etc/magic
@@ -37,7 +37,7 @@
 #include "file.h"
 
 #ifndef	lint
-static char *moduleid = "$OpenBSD: softmagic.c,v 1.4 1998/07/10 15:05:27 mickey Exp $";
+static char *moduleid = "$OpenBSD: softmagic.c,v 1.5 2001/11/19 19:02:13 mpech Exp $";
 #endif	/* lint */
 
 static int match	__P((unsigned char *, int));
@@ -385,8 +385,8 @@ mcheck(p, m)
 union VALUETYPE* p;
 struct magic *m;
 {
-	register uint32 l = m->value.l;
-	register uint32 v;
+	uint32 l = m->value.l;
+	uint32 v;
 	int matched;
 
 	if ( (m->value.s[0] == 'x') && (m->value.s[1] == '\0') ) {
@@ -424,9 +424,9 @@ struct magic *m;
 		 */
 		v = 0;
 		{
-			register unsigned char *a = (unsigned char*)m->value.s;
-			register unsigned char *b = (unsigned char*)p->s;
-			register int len = m->vallen;
+			unsigned char *a = (unsigned char*)m->value.s;
+			unsigned char *b = (unsigned char*)p->s;
+			int len = m->vallen;
 
 			while (--len >= 0)
 				if ((v = *b++ - *a++) != '\0')
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index fe26f822342..441433e0a2d 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: function.c,v 1.20 2000/07/19 19:30:10 mickey Exp $	*/
+/*	$OpenBSD: function.c,v 1.21 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)function.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: function.c,v 1.20 2000/07/19 19:30:10 mickey Exp $";
+static char rcsid[] = "$OpenBSD: function.c,v 1.21 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -337,10 +337,10 @@ c_empty()
  */
 int
 f_exec(plan, entry)
-	register PLAN *plan;
+	PLAN *plan;
 	FTSENT *entry;
 {
-	register int cnt;
+	int cnt;
 	pid_t pid;
 	int status;
 
@@ -386,8 +386,8 @@ c_exec(argvp, isok)
 	int isok;
 {
 	PLAN *new;			/* node returned */
-	register int cnt;
-	register char **argv, **ap, *p;
+	int cnt;
+	char **argv, **ap, *p;
 
 	isoutput = 1;
     
@@ -438,10 +438,10 @@ c_exec(argvp, isok)
  */
 int
 f_execdir(plan, entry)
-	register PLAN *plan;
+	PLAN *plan;
 	FTSENT *entry;
 {
-	register int cnt;
+	int cnt;
 	pid_t pid;
 	int status, fd;
 	char base[MAXPATHLEN];
@@ -506,8 +506,8 @@ c_execdir(argvp)
 	char ***argvp;
 {
 	PLAN *new;			/* node returned */
-	register int cnt;
-	register char **argv, **ap, *p;
+	int cnt;
+	char **argv, **ap, *p;
 
 	ftsoptions &= ~FTS_NOSTAT;
 	isoutput = 1;
@@ -679,7 +679,7 @@ PLAN *
 c_fstype(arg)
 	char *arg;
 {
-	register PLAN *new;
+	PLAN *new;
     
 	ftsoptions &= ~FTS_NOSTAT;
     
@@ -1433,8 +1433,8 @@ f_expr(plan, entry)
 	PLAN *plan;
 	FTSENT *entry;
 {
-	register PLAN *p;
-	register int state;
+	PLAN *p;
+	int state;
 
 	for (p = plan->p_data[0];
 	    p && (state = (p->eval)(p, entry)); p = p->next);
@@ -1468,8 +1468,8 @@ f_not(plan, entry)
 	PLAN *plan;
 	FTSENT *entry;
 {
-	register PLAN *p;
-	register int state;
+	PLAN *p;
+	int state;
 
 	for (p = plan->p_data[0];
 	    p && (state = (p->eval)(p, entry)); p = p->next);
@@ -1493,8 +1493,8 @@ f_or(plan, entry)
 	PLAN *plan;
 	FTSENT *entry;
 {
-	register PLAN *p;
-	register int state;
+	PLAN *p;
+	int state;
 
 	for (p = plan->p_data[0];
 	    p && (state = (p->eval)(p, entry)); p = p->next);
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 5a0940b4a9a..ade1fa5a178 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.6 2001/11/17 19:50:53 millert Exp $	*/
+/*	$OpenBSD: misc.c,v 1.7 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)misc.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: misc.c,v 1.6 2001/11/17 19:50:53 millert Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -63,8 +63,8 @@ brace_subst(orig, store, path, len)
 	char *orig, **store, *path;
 	int len;
 {
-	register int plen;
-	register char ch, *p;
+	int plen;
+	char ch, *p;
 
 	plen = strlen(path);
 	for (p = *store; (ch = *orig); ++orig)
@@ -87,7 +87,7 @@ brace_subst(orig, store, path, len)
  */
 int
 queryuser(argv)
-	register char **argv;
+	char **argv;
 {
 	int ch, first, nl;
 
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index d9253e922ab..c7779a556ac 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: operator.c,v 1.5 1999/12/04 22:42:32 millert Exp $	*/
+/*	$OpenBSD: operator.c,v 1.6 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)operator.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: operator.c,v 1.5 1999/12/04 22:42:32 millert Exp $";
+static char rcsid[] = "$OpenBSD: operator.c,v 1.6 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -77,7 +77,7 @@ static PLAN *
 yankexpr(planp)    
 	PLAN **planp;		/* pointer to top of plan (modified) */
 {
-	register PLAN *next;	/* temp node holding subexpression results */
+	PLAN *next;	/* temp node holding subexpression results */
 	PLAN *node;		/* pointer to returned node or expression */
 	PLAN *tail;		/* pointer to tail of subplan */
 	PLAN *subplan;		/* pointer to head of ( ) expression */
@@ -132,8 +132,8 @@ PLAN *
 paren_squish(plan)
 	PLAN *plan;		/* plan with ( ) nodes */
 {
-	register PLAN *expr;	/* pointer to next expression */
-	register PLAN *tail;	/* pointer to tail of result plan */
+	PLAN *expr;	/* pointer to next expression */
+	PLAN *tail;	/* pointer to tail of result plan */
 	PLAN *result;		/* pointer to head of result plan */
     
 	result = tail = NULL;
@@ -170,9 +170,9 @@ PLAN *
 not_squish(plan)
 	PLAN *plan;		/* plan to process */
 {
-	register PLAN *next;	/* next node being processed */
-	register PLAN *node;	/* temporary node used in N_NOT processing */
-	register PLAN *tail;	/* pointer to tail of result plan */
+	PLAN *next;	/* next node being processed */
+	PLAN *node;	/* temporary node used in N_NOT processing */
+	PLAN *tail;	/* pointer to tail of result plan */
 	PLAN *result;		/* pointer to head of result plan */
     
 	tail = result = next = NULL;
@@ -230,8 +230,8 @@ PLAN *
 or_squish(plan)
 	PLAN *plan;		/* plan with ors to be squished */
 {
-	register PLAN *next;	/* next node being processed */
-	register PLAN *tail;	/* pointer to tail of result plan */
+	PLAN *next;	/* next node being processed */
+	PLAN *tail;	/* pointer to tail of result plan */
 	PLAN *result;		/* pointer to head of result plan */
     
 	tail = result = next = NULL;
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 03033cb4d11..8da5413c11c 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: option.c,v 1.12 2000/07/08 16:09:34 millert Exp $	*/
+/*	$OpenBSD: option.c,v 1.13 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)option.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: option.c,v 1.12 2000/07/08 16:09:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: option.c,v 1.13 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -112,7 +112,7 @@ PLAN *
 find_create(argvp)
 	char ***argvp;
 {
-	register OPTION *p;
+	OPTION *p;
 	PLAN *new;
 	char **argv;
 
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 060046ed0dd..58cdcd51280 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: finger.c,v 1.11 2001/07/04 06:30:44 deraadt Exp $	*/
+/*	$OpenBSD: finger.c,v 1.12 2001/11/19 19:02:13 mpech Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -54,7 +54,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)finger.c	5.22 (Berkeley) 6/29/90";*/
-static char rcsid[] = "$OpenBSD: finger.c,v 1.11 2001/07/04 06:30:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: finger.c,v 1.12 2001/11/19 19:02:13 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -204,8 +204,8 @@ userlist(argc, argv)
 	int argc;
 	char **argv;
 {
-	register int i;
-	register PERSON *pn;
+	int i;
+	PERSON *pn;
 	PERSON *nethead, **nettail;
 	struct utmp user;
 	struct passwd *pw;
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index dae17817535..f00be30ec68 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fold.c,v 1.4 2001/07/09 21:59:02 pjanzen Exp $	*/
+/*	$OpenBSD: fold.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: fold.c,v 1.6 1995/09/01 01:42:44 jtc Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: fold.c,v 1.4 2001/07/09 21:59:02 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: fold.c,v 1.5 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -68,7 +68,7 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register int ch;
+	int ch;
 	int width;
 	char *p;
 
@@ -130,12 +130,12 @@ main(argc, argv)
  */
 static void
 fold(width)
-	register int width;
+	int width;
 {
 	static char *buf = NULL;
 	static int   buf_max = 0;
-	register int ch, col;
-	register int indx;
+	int ch, col;
+	int indx;
 
 	col = indx = 0;
 	while ((ch = getchar()) != EOF) {
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index b05b3500adf..32a0a3c14a9 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: from.c,v 1.7 2001/07/12 05:17:06 deraadt Exp $	*/
+/*	$OpenBSD: from.c,v 1.8 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: from.c,v 1.6 1995/09/01 01:39:10 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: from.c,v 1.7 2001/07/12 05:17:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: from.c,v 1.8 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -140,7 +140,7 @@ int
 match(line, sender)
 	char *line, *sender;
 {
-	register char ch, pch, first, *p, *t;
+	char ch, pch, first, *p, *t;
 
 	for (first = *sender++;;) {
 		if (isspace(ch = *line))
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index b1d700bd14e..2cef80cd639 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsplit.c,v 1.7 2000/06/30 16:00:13 millert Exp $	*/
+/*	$OpenBSD: fsplit.c,v 1.8 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -44,7 +44,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)fsplit.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: fsplit.c,v 1.7 2000/06/30 16:00:13 millert Exp $";
+static char rcsid[] = "$OpenBSD: fsplit.c,v 1.8 2001/11/19 19:02:14 mpech Exp $";
 #endif				/* not lint */
 
 #include <ctype.h>
@@ -111,9 +111,9 @@ int
 main(argc, argv)
 	char  **argv;
 {
-	register FILE *ofp;	/* output file */
-	register int rv;	/* 1 if got card in output file, 0 otherwise */
-	register char *ptr;
+	FILE *ofp;	/* output file */
+	int rv;	/* 1 if got card in output file, 0 otherwise */
+	char *ptr;
 	int     nflag,		/* 1 if got name of subprog., 0 otherwise */
 	        retval, i;
 	/* must be as large as max(sizeof(x), sizeof(mainp), sizeof(blockp)) */
@@ -256,7 +256,7 @@ get_name(name, letters)
 	char   *name;
 	int     letters;
 {
-	register char *ptr;
+	char *ptr;
 
 	while (stat(name, &sbuf) >= 0) {
 		for (ptr = name + letters + 2; ptr >= name + letters; ptr--) {
@@ -273,7 +273,7 @@ get_name(name, letters)
 int
 getline()
 {
-	register char *ptr;
+	char *ptr;
 
 	for (ptr = buf; ptr < &buf[BSZ];) {
 		*ptr = getc(ifp);
@@ -292,7 +292,7 @@ getline()
 int
 lend()
 {
-	register char *p;
+	char *p;
 
 	if ((p = skiplab(buf)) == 0)
 		return (0);
@@ -322,7 +322,7 @@ lname(s)
 	char   *s;
 {
 #define LINESIZE 80
-	register char *ptr, *p;
+	char *ptr, *p;
 	char    line[LINESIZE], *iptr = line;
 
 	/* first check for comment cards */
@@ -407,7 +407,7 @@ char   *
 functs(p)
 	char   *p;
 {
-	register char *ptr;
+	char *ptr;
 
 /*      look for typed functions such as: real*8 function,
                 character*16 function, character*(*) function  */
@@ -435,7 +435,7 @@ char   *
 skiplab(p)
 	char   *p;
 {
-	register char *ptr;
+	char *ptr;
 
 	for (ptr = p; ptr < &p[6]; ptr++) {
 		if (*ptr == ' ')
@@ -454,7 +454,7 @@ char   *
 look(s, m)
 	char   *s, *m;
 {
-	register char *sp, *mp;
+	char *sp, *mp;
 
 	sp = s;
 	mp = m;
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index aa26789d322..3ccc8e08df5 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fstat.c,v 1.31 2001/07/12 05:17:06 deraadt Exp $	*/
+/*	$OpenBSD: fstat.c,v 1.32 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)fstat.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: fstat.c,v 1.31 2001/07/12 05:17:06 deraadt Exp $";
+static char *rcsid = "$OpenBSD: fstat.c,v 1.32 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -167,7 +167,7 @@ main(argc, argv)
 {
 	extern char *optarg;
 	extern int optind;
-	register struct passwd *passwd;
+	struct passwd *passwd;
 	struct kinfo_proc *p, *plast;
 	int arg, ch, what;
 	char *memf, *nlistf;
@@ -441,7 +441,7 @@ vtrans(vp, i, flag, offset)
 	}
 	if (checkfile) {
 		int fsmatch = 0;
-		register DEVS *d;
+		DEVS *d;
 
 		if (badtype)
 			return;
@@ -569,7 +569,7 @@ nfs_filestat(vp, fsp)
 	struct filestat *fsp;
 {
 	struct nfsnode nfsnode;
-	register mode_t mode;
+	mode_t mode;
 
 	if (!KVM_READ(VTONFS(vp), &nfsnode, sizeof (nfsnode))) {
 		dprintf("can't read nfsnode at %p for pid %d", VTONFS(vp), Pid);
@@ -716,7 +716,7 @@ getmnton(m)
 		struct mount *m;
 		char mntonname[MNAMELEN];
 	} *mhead = NULL;
-	register struct mtab *mt;
+	struct mtab *mt;
 
 	for (mt = mhead; mt != NULL; mt = mt->next)
 		if (m == mt->m)
@@ -1016,7 +1016,7 @@ getinetproto(number)
 	int number;
 {
 	static int isopen;
-	register struct protoent *pe;
+	struct protoent *pe;
 
 	if (!isopen)
 		setprotoent(++isopen);
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 891ba44b786..596f1075fd1 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arcs.c,v 1.4 2001/08/12 12:03:03 heko Exp $	*/
+/*	$OpenBSD: arcs.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: arcs.c,v 1.6 1995/04/19 07:15:52 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)arcs.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: arcs.c,v 1.4 2001/08/12 12:03:03 heko Exp $";
+static char rcsid[] = "$OpenBSD: arcs.c,v 1.5 2001/11/19 19:02:14 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -359,8 +359,8 @@ timepropagate( parentp )
 void
 cyclelink()
 {
-    register nltype	*nlp;
-    register nltype	*cyclenlp;
+    nltype	*nlp;
+    nltype	*cyclenlp;
     int			cycle;
     nltype		*memberp;
     arctype		*arcp;
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 1da0a6096ae..70245ce47f7 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gprof.c,v 1.8 2001/03/25 19:23:40 mickey Exp $	*/
+/*	$OpenBSD: gprof.c,v 1.9 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: gprof.c,v 1.8 1995/04/19 07:15:59 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: gprof.c,v 1.8 2001/03/25 19:23:40 mickey Exp $";
+static char rcsid[] = "$OpenBSD: gprof.c,v 1.9 2001/11/19 19:02:14 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -234,7 +234,7 @@ getnfile()
     fclose(nfile);
 #   ifdef DEBUG
 	if ( debug & AOUTDEBUG ) {
-	    register int j;
+	    int j;
 
 	    for (j = 0; j < nname; j++){
 		printf("[getnfile] 0X%08x\t%s\n", nl[j].value, nl[j].name);
@@ -265,7 +265,7 @@ void
 getsymtab(nfile)
     FILE	*nfile;
 {
-    register long	i;
+    long		i;
     int			askfor;
     struct nlist	nbuf;
 
@@ -459,8 +459,8 @@ void
 dumpsum( sumfile )
     char *sumfile;
 {
-    register nltype *nlp;
-    register arctype *arcp;
+    nltype *nlp;
+    arctype *arcp;
     struct rawarc arc;
     FILE *sfile;
 
@@ -515,7 +515,7 @@ readsamples(pfile)
     FILE	*pfile;
 {
     UNIT	sample;
-    register int i;
+    int i;
     
     if (samples == 0) {
 	samples = (UNIT *) calloc(sampbytes, sizeof (UNIT));
@@ -567,11 +567,11 @@ readsamples(pfile)
 void
 asgnsamples()
 {
-    register int	j;
+    int	j;
     UNIT		ccnt;
     double		time;
     unsigned long	pcl, pch;
-    register int	i;
+    int	i;
     unsigned long	overlap;
     unsigned long	svalue0, svalue1;
 
@@ -657,7 +657,7 @@ max(a, b)
 void
 alignentries()
 {
-    register struct nl	*nlp;
+    struct nl		*nlp;
     unsigned long	bucket_of_entry;
     unsigned long	bucket_of_code;
 
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 682d4e372a6..643cbb0545b 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lookup.c,v 1.3 2001/03/22 05:18:30 mickey Exp $	*/
+/*	$OpenBSD: lookup.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: lookup.c,v 1.5 1995/04/19 07:16:06 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lookup.c,v 1.3 2001/03/22 05:18:30 mickey Exp $";
+static char rcsid[] = "$OpenBSD: lookup.c,v 1.4 2001/11/19 19:02:14 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,11 +53,11 @@ nltype *
 nllookup( address )
     unsigned long	address;
 {
-    register long	low;
-    register long	middle;
-    register long	high;
+    long	low;
+    long	middle;
+    long	high;
 #   ifdef DEBUG
-	register int	probes;
+	int	probes;
 
 	probes = 0;
 #   endif DEBUG
diff --git a/usr.bin/gprof/mips.c b/usr.bin/gprof/mips.c
index ec3caf60000..9543aa303b8 100644
--- a/usr.bin/gprof/mips.c
+++ b/usr.bin/gprof/mips.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mips.c,v 1.3 2001/03/22 05:18:30 mickey Exp $	*/
+/*	$OpenBSD: mips.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: mips.c,v 1.4 1995/04/19 07:16:11 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)mips.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: mips.c,v 1.3 2001/03/22 05:18:30 mickey Exp $";
+static char rcsid[] = "$OpenBSD: mips.c,v 1.4 2001/11/19 19:02:14 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -83,11 +83,11 @@ findcall(parentp, p_lowpc, p_highpc)
 	unsigned long	p_lowpc;
 	unsigned long	p_highpc;
 {
-	register u_long pc;
+	u_long pc;
 	nltype *childp;
 	unsigned long destpc;
-	register long op;
-	register int off;
+	long op;
+	int off;
 
 	if (textspace == 0)
 		return;
diff --git a/usr.bin/gprof/pmax.c b/usr.bin/gprof/pmax.c
index 6f76533e58a..85ef7582e81 100644
--- a/usr.bin/gprof/pmax.c
+++ b/usr.bin/gprof/pmax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmax.c,v 1.3 2001/03/22 05:18:30 mickey Exp $	*/
+/*	$OpenBSD: pmax.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: pmax.c,v 1.3 1995/04/19 07:16:18 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)mips.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: pmax.c,v 1.3 2001/03/22 05:18:30 mickey Exp $";
+static char rcsid[] = "$OpenBSD: pmax.c,v 1.4 2001/11/19 19:02:14 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -83,11 +83,11 @@ findcall(parentp, p_lowpc, p_highpc)
 	unsigned long	p_lowpc;
 	unsigned long	p_highpc;
 {
-	register u_long pc;
+	u_long pc;
 	nltype *childp;
 	unsigned long destpc;
-	register long op;
-	register int off;
+	long op;
+	int off;
 
 	if (textspace == 0)
 		return;
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 20e30ef1528..1e83faf4b1a 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printgprof.c,v 1.4 2001/03/31 23:27:02 fgsch Exp $	*/
+/*	$OpenBSD: printgprof.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: printgprof.c,v 1.5 1995/04/19 07:16:21 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)printgprof.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: printgprof.c,v 1.4 2001/03/31 23:27:02 fgsch Exp $";
+static char rcsid[] = "$OpenBSD: printgprof.c,v 1.5 2001/11/19 19:02:14 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: printgprof.c,v 1.4 2001/03/31 23:27:02 fgsch Ex
 void
 printprof()
 {
-    register nltype	*np;
+    nltype		*np;
     nltype		**sortednlp;
     int			index;
 
@@ -122,7 +122,7 @@ flatprofheader()
 
 void
 flatprofline( np )
-    register nltype	*np;
+    nltype	*np;
 {
 
     if ( zflag == 0 && np -> ncall == 0 && np -> time == 0 ) {
@@ -173,7 +173,7 @@ gprofheader()
 
 void
 gprofline( np )
-    register nltype	*np;
+    nltype	*np;
 {
     char	kirkbuffer[ BUFSIZ ];
 
@@ -249,8 +249,8 @@ totalcmp( npp1 , npp2 )
     nltype	**npp1;
     nltype	**npp2;
 {
-    register nltype	*np1 = *npp1;
-    register nltype	*np2 = *npp2;
+    nltype		*np1 = *npp1;
+    nltype		*np2 = *npp2;
     double		diff;
 
     diff =    ( np1 -> propself + np1 -> propchild )
@@ -679,7 +679,7 @@ void
 printindex()
 {
     nltype		**namesortnlp;
-    register nltype	*nlp;
+    nltype		*nlp;
     int			index, nnames, todo, i, j;
     char		peterbuffer[ BUFSIZ ];
 
diff --git a/usr.bin/gprof/sparc.c b/usr.bin/gprof/sparc.c
index 59087bfc3c7..23f4d5c757d 100644
--- a/usr.bin/gprof/sparc.c
+++ b/usr.bin/gprof/sparc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sparc.c,v 1.3 2001/03/22 05:18:30 mickey Exp $	*/
+/*	$OpenBSD: sparc.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: sparc.c,v 1.4 1995/04/19 07:16:24 cgd Exp $	*/
 
 /*
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)sparc.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: sparc.c,v 1.3 2001/03/22 05:18:30 mickey Exp $";
+static char rcsid[] = "$OpenBSD: sparc.c,v 1.4 2001/11/19 19:02:14 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -81,11 +81,11 @@ findcall(parentp, p_lowpc, p_highpc)
 	unsigned long	p_lowpc;
 	unsigned long	p_highpc;
 {
-	register u_long pc;
+	u_long pc;
 	nltype *childp;
 	unsigned long destpc;
-	register long op;
-	register int off;
+	long op;
+	int off;
 
 	if (textspace == 0)
 		return;
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index ff65a421bfd..b7059415c4c 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: display.c,v 1.7 2001/11/02 19:41:06 mickey Exp $	*/
+/*	$OpenBSD: display.c,v 1.8 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)display.c	5.11 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$OpenBSD: display.c,v 1.7 2001/11/02 19:41:06 mickey Exp $";
+static char rcsid[] = "$OpenBSD: display.c,v 1.8 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -139,11 +139,11 @@ void
 display()
 {
 	extern FU *endfu;
-	register FS *fs;
-	register FU *fu;
-	register PR *pr;
-	register int cnt;
-	register u_char *bp;
+	FS *fs;
+	FU *fu;
+	PR *pr;
+	int cnt;
+	u_char *bp;
 	off_t saveaddress;
 	u_char savech, *savebp, *get();
 
@@ -195,7 +195,7 @@ bpad(pr)
 	PR *pr;
 {
 	static char *spec = " -0+#";
-	register char *p1, *p2;
+	char *p1, *p2;
 
 	/*
 	 * remove all conversion flags; '-' is the only one valid
@@ -218,7 +218,7 @@ get()
 	extern int length;
 	static int ateof = 1;
 	static u_char *curp, *savp;
-	register int n;
+	int n;
 	int need, nread;
 	int valid_save = 0;
 	u_char *tmpp;
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index 6d16a5a6a80..c1dda5e0762 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hexdump.c,v 1.5 2001/07/12 05:17:10 deraadt Exp $	*/
+/*	$OpenBSD: hexdump.c,v 1.6 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)hexdump.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: hexdump.c,v 1.5 2001/07/12 05:17:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: hexdump.c,v 1.6 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -59,7 +59,7 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register FS *tfs;
+	FS *tfs;
 	char *p;
 
 	if (!(p = strrchr(argv[0], 'o')) || strcmp(p, "od"))
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 738962dfc29..fc1fec435ce 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: odsyntax.c,v 1.7 2001/11/02 19:41:06 mickey Exp $	*/
+/*	$OpenBSD: odsyntax.c,v 1.8 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)odsyntax.c	5.4 (Berkeley) 3/8/91";*/
-static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.7 2001/11/02 19:41:06 mickey Exp $";
+static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.8 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -160,7 +160,7 @@ odoffset(argc, argvp)
 	char ***argvp;
 {
 	extern off_t skip;
-	register char *num, *p;
+	char *num, *p;
 	int base;
 	char *end;
 
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index b512e5fadc8..af4144820a9 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.7 2001/11/02 19:41:06 mickey Exp $	*/
+/*	$OpenBSD: parse.c,v 1.8 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)parse.c	5.6 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$OpenBSD: parse.c,v 1.7 2001/11/02 19:41:06 mickey Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.8 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -59,7 +59,7 @@ void
 addfile(name)
 	char *name;
 {
-	register char *p;
+	char *p;
 	FILE *fp;
 	size_t len;
 
@@ -84,7 +84,7 @@ void
 add(fmt)
 	char *fmt;
 {
-	register char *p;
+	char *p;
 	static FS **nextfs;
 	FS *tfs;
 	FU *tfu, **nextfu;
@@ -163,9 +163,9 @@ int
 size(fs)
 	FS *fs;
 {
-	register FU *fu;
-	register int bcnt, cursize;
-	register char *fmt;
+	FU *fu;
+	int bcnt, cursize;
+	char *fmt;
 	int prec;
 
 	/* figure out the data block size needed for each format unit */
@@ -218,9 +218,9 @@ rewrite(fs)
 	FS *fs;
 {
 	enum { NOTOKAY, USEBCNT, USEPREC } sokay;
-	register PR *pr, **nextpr;
-	register FU *fu;
-	register char *p1, *p2;
+	PR *pr, **nextpr;
+	FU *fu;
+	char *p1, *p2;
 	char savech, *fmtp;
 	int nconv, prec;
 
@@ -449,9 +449,9 @@ sw2:					switch(fu->bcnt) {
 
 void
 escape(p1)
-	register char *p1;
+	char *p1;
 {
-	register char *p2;
+	char *p2;
 
 	/* alphabetic escape sequences have to be done in place */
 	for (p2 = p1;; ++p1, ++p2) {
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 553f65acd7c..c74f863983c 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: id.c,v 1.9 2001/07/12 05:17:11 deraadt Exp $	*/
+/*	$OpenBSD: id.c,v 1.10 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)id.c	8.3 (Berkeley) 4/28/95";*/
-static char rcsid[] = "$OpenBSD: id.c,v 1.9 2001/07/12 05:17:11 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: id.c,v 1.10 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -233,10 +233,10 @@ current()
 
 void
 user(pw)
-	register struct passwd *pw;
+	struct passwd *pw;
 {
-	register struct group *gr;
-	register char *fmt;
+	struct group *gr;
+	char *fmt;
 	int cnt, id, lastid, ngroups, groups[NGROUPS + 1];
 
 	id = pw->pw_uid;
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index fcdb807f6a1..454b34fa039 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: args.c,v 1.7 2001/06/25 04:58:31 pjanzen Exp $	*/
+/*	$OpenBSD: args.c,v 1.8 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: args.c,v 1.7 2001/06/25 04:58:31 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: args.c,v 1.8 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -252,7 +252,7 @@ void
 set_option(arg)
     char *arg;
 {
-    register struct pro *p;
+    struct pro *p;
 
     arg++;			/* ignore leading "-" */
     for (p = pro; p->p_name; p++)
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index 55e84599942..9f79eb7369c 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: indent.c,v 1.10 2001/06/25 04:58:31 pjanzen Exp $	*/
+/*	$OpenBSD: indent.c,v 1.11 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -47,7 +47,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";*/
-static char rcsid[] = "$OpenBSD: indent.c,v 1.10 2001/06/25 04:58:31 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: indent.c,v 1.11 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ main(argc, argv)
     int         force_nl;	/* when true, code must be broken */
     int         hd_type;	/* used to store type of stmt for if (...),
 				 * for (...), etc */
-    register int i;		/* local loop counter */
+    int 	i;		/* local loop counter */
     int         scase;		/* set to true when we see a case, so we will
 				 * know what to do with the following colon */
     int         sp_sw;		/* when true, we are in the expressin of
@@ -92,7 +92,7 @@ main(argc, argv)
     int         squest;		/* when this is positive, we have seen a ?
 				 * without the matching : in a <c>?<s>:<s>
 				 * construct */
-    register char *t_ptr;	/* used for copying tokens */
+    char 	*t_ptr;		/* used for copying tokens */
     int         type_code;	/* the type of token, returned by lexi */
 
     int         last_else = 0;	/* true iff last keyword was an else */
@@ -276,7 +276,7 @@ main(argc, argv)
 	    ps.ind_level = ps.i_l_follow = col / ps.ind_size;
     }
     if (troff) {
-	register char *p = in_name,
+	char *p = in_name,
 	           *beg = in_name;
 
 	while (*p)
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index 40f2e93d939..82ff9f1253d 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.4 2001/01/08 07:14:42 pjanzen Exp $	*/
+/*	$OpenBSD: parse.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: parse.c,v 1.4 2001/01/08 07:14:42 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.5 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -253,7 +253,7 @@ void
 reduce()
 {
 
-    register int i;
+    int i;
 
     for (;;) {			/* keep looping until there is nothing left to
 				 * reduce */
diff --git a/usr.bin/infocmp/infocmp.c b/usr.bin/infocmp/infocmp.c
index 91a1b6181db..f888d46386c 100644
--- a/usr.bin/infocmp/infocmp.c
+++ b/usr.bin/infocmp/infocmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: infocmp.c,v 1.14 2001/10/24 13:06:36 mpech Exp $	*/
+/*	$OpenBSD: infocmp.c,v 1.15 2001/11/19 19:02:14 mpech Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
@@ -337,8 +337,8 @@ static void
 compare_predicate(int type, int idx, const char *name)
 /* predicate function to use for entry difference reports */
 {
-    register ENTRY *e1 = &entries[0];
-    register ENTRY *e2 = &entries[1];
+    ENTRY *e1 = &entries[0];
+    ENTRY *e2 = &entries[1];
     char buf1[MAX_STRING], buf2[MAX_STRING];
     int b1, b2;
     int n1, n2;
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 3337e485668..c8f814e1e6e 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lam.c,v 1.2 1996/06/26 05:34:49 deraadt Exp $	*/
+/*	$OpenBSD: lam.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: lam.c,v 1.2 1994/11/14 20:27:42 jtc Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)lam.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: lam.c,v 1.2 1996/06/26 05:34:49 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lam.c,v 1.3 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -83,7 +83,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register struct	openfile *ip;
+	struct	openfile *ip;
 
 	getargs(argv);
 	if (!morefiles)
@@ -105,9 +105,9 @@ void
 getargs(av)
 	char *av[];
 {
-	register struct	openfile *ip = input;
-	register char *p;
-	register char *c;
+	struct	openfile *ip = input;
+	char *p;
+	char *c;
 	static char fmtbuf[BUFSIZ];
 	char *fmtp = fmtbuf;
 	int P, S, F, T;
@@ -177,8 +177,8 @@ char *
 pad(ip)
 	struct openfile *ip;
 {
-	register char *p = ip->sepstring;
-	register char *lp = linep;
+	char *p = ip->sepstring;
+	char *lp = linep;
 
 	while (*p)
 		*lp++ = *p++;
@@ -194,9 +194,9 @@ gatherline(ip)
 	struct openfile *ip;
 {
 	char s[BUFSIZ];
-	register int c;
-	register char *p;
-	register char *lp = linep;
+	int c;
+	char *p;
+	char *lp = linep;
 	char *end = s + BUFSIZ;
 
 	if (ip->eof)
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index ffc747712b9..3201324fed3 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lastcomm.c,v 1.8 2001/07/18 17:17:39 pvalchev Exp $	*/
+/*	$OpenBSD: lastcomm.c,v 1.9 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: lastcomm.c,v 1.9 1995/10/22 01:43:42 ghudson Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)lastcomm.c	8.2 (Berkeley) 4/29/95";
 #endif
-static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.8 2001/07/18 17:17:39 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.9 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -76,7 +76,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register char *p;
+	char *p;
 	struct acct ab;
 	struct stat sb;
 	FILE *fp;
@@ -164,7 +164,7 @@ time_t
 expand(t)
 	u_int t;
 {
-	register time_t nt;
+	time_t nt;
 
 	nt = t & 017777;
 	t >>= 13;
@@ -177,7 +177,7 @@ expand(t)
 
 char *
 flagbits(f)
-	register int f;
+	int f;
 {
 	static char flags[20] = "-";
 	char *p;
@@ -196,8 +196,8 @@ flagbits(f)
 
 int
 requested(argv, acp)
-	register char *argv[];
-	register struct acct *acp;
+	char *argv[];
+	struct acct *acp;
 {
 	do {
 		if (!strcmp(user_from_uid(acp->ac_uid, 0), *argv))
diff --git a/usr.bin/learn/src/lcount.c b/usr.bin/learn/src/lcount.c
index 9a424ad126b..90c3fc1d2d9 100644
--- a/usr.bin/learn/src/lcount.c
+++ b/usr.bin/learn/src/lcount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcount.c,v 1.3 2001/01/29 01:57:59 niklas Exp $	*/
+/*	$OpenBSD: lcount.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* count lines in something */
 
@@ -31,7 +31,7 @@ THIS SOFTWARE.
 int
 main()
 {
-	register n, c;
+	int n, c;
 
 	n = 0;
 	while ((c = getchar()) != EOF)
diff --git a/usr.bin/learn/src/learn.c b/usr.bin/learn/src/learn.c
index bc1b1e8d2bd..42227bdcc31 100644
--- a/usr.bin/learn/src/learn.c
+++ b/usr.bin/learn/src/learn.c
@@ -2,7 +2,7 @@
  * learn, from V7 UNIX: one of the earliest Computer Based Training (CBT)
  * programs still in existence.
  *
- * $OpenBSD: learn.c,v 1.6 2001/07/18 17:17:39 pvalchev Exp $
+ * $OpenBSD: learn.c,v 1.7 2001/11/19 19:02:14 mpech Exp $
  */
 
 /****************************************************************
@@ -627,7 +627,7 @@ char *s;
 	/* instead of sh cmd */
 	char p[300];
 	char *np[40];
-	register char *t;
+	char *t;
 	int nv, type, stat;
 
 	type = EASY;	/* we hope */
diff --git a/usr.bin/learn/src/tee.c b/usr.bin/learn/src/tee.c
index ce39e292f6a..3913b4dfdef 100644
--- a/usr.bin/learn/src/tee.c
+++ b/usr.bin/learn/src/tee.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tee.c,v 1.3 2001/01/29 01:57:59 niklas Exp $	*/
+/*	$OpenBSD: tee.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* tee - copy stdin into .ocopy, for learn(1). */
 
@@ -61,7 +61,7 @@ put(c, f)
 }
 fl(f)
 {
-	register char *s;
+	char *s;
 
 	s = ln;
 	while (*s == '$' && *(s+1) == ' ')
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 4c2d069c389..ebcd162580d 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: leave.c,v 1.5 2000/09/20 21:57:37 pjanzen Exp $	*/
+/*	$OpenBSD: leave.c,v 1.6 2001/11/19 19:02:14 mpech Exp $	*/
 /*	$NetBSD: leave.c,v 1.4 1995/07/03 16:50:13 phil Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: leave.c,v 1.5 2000/09/20 21:57:37 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: leave.c,v 1.6 2001/11/19 19:02:14 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -69,9 +69,9 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register u_int secs;
-	register int hours, minutes;
-	register char c, *cp;
+	u_int secs;
+	int hours, minutes;
+	char c, *cp;
 	struct tm *t;
 	time_t now;
 	int plusnow;
@@ -132,7 +132,7 @@ void
 doalarm(secs)
 	u_int secs;
 {
-	register int bother;
+	int bother;
 	time_t daytime;
 	int pid;
 
diff --git a/usr.bin/less/brac.c b/usr.bin/less/brac.c
index ad218e02b3c..7765055d878 100644
--- a/usr.bin/less/brac.c
+++ b/usr.bin/less/brac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brac.c,v 1.2 2001/01/29 01:58:00 niklas Exp $	*/
+/*	$OpenBSD: brac.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -44,13 +44,13 @@
  */
 	public void
 match_brac(obrac, cbrac, forwdir, n)
-	register int obrac;
-	register int cbrac;
+	int obrac;
+	int cbrac;
 	int forwdir;
 	int n;
 {
-	register int c;
-	register int nest;
+	int c;
+	int nest;
 	POSITION pos;
 	int (*chget)();
 
diff --git a/usr.bin/less/ch.c b/usr.bin/less/ch.c
index a0dc2811c72..762cf8a74c9 100644
--- a/usr.bin/less/ch.c
+++ b/usr.bin/less/ch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ch.c,v 1.2 2001/01/29 01:58:00 niklas Exp $	*/
+/*	$OpenBSD: ch.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -108,9 +108,9 @@ static int ch_addbuf();
 	int
 fch_get()
 {
-	register struct buf *bp;
-	register int n;
-	register int slept;
+	struct buf *bp;
+	int n;
+	int slept;
 	POSITION pos;
 	POSITION len;
 
@@ -314,7 +314,7 @@ end_logfile()
 	public void
 sync_logfile()
 {
-	register struct buf *bp;
+	struct buf *bp;
 	int warned = FALSE;
 	long block;
 	long nblocks;
@@ -352,7 +352,7 @@ sync_logfile()
 buffered(block)
 	long block;
 {
-	register struct buf *bp;
+	struct buf *bp;
 
 	for (bp = ch_bufhead;  bp != END_OF_CHAIN;  bp = bp->next)
 		if (bp->block == block)
@@ -366,7 +366,7 @@ buffered(block)
  */
 	public int
 ch_seek(pos)
-	register POSITION pos;
+	POSITION pos;
 {
 	long new_block;
 	POSITION len;
@@ -429,7 +429,7 @@ ch_end_seek()
 	public int
 ch_beg_seek()
 {
-	register struct buf *bp, *firstbp;
+	struct buf *bp, *firstbp;
 
 	/*
 	 * Try a plain ch_seek first.
@@ -480,7 +480,7 @@ ch_tell()
 	public int
 ch_forw_get()
 {
-	register int c;
+	int c;
 
 	c = ch_get();
 	if (c == EOI)
@@ -550,7 +550,7 @@ ch_nbuf(want_nbufs)
 	public void
 ch_flush()
 {
-	register struct buf *bp;
+	struct buf *bp;
 
 	if (!(ch_flags & CH_CANSEEK))
 	{
@@ -598,7 +598,7 @@ ch_flush()
 	static int
 ch_addbuf()
 {
-	register struct buf *bp;
+	struct buf *bp;
 
 	/*
 	 * Allocate and initialize a new buffer and link it 
@@ -622,7 +622,7 @@ ch_addbuf()
 	static void
 ch_delbufs()
 {
-	register struct buf *bp;
+	struct buf *bp;
 
 	while (ch_bufhead != END_OF_CHAIN)
 	{
diff --git a/usr.bin/less/charset.c b/usr.bin/less/charset.c
index 0cc8a48924f..04b4f83ed4a 100644
--- a/usr.bin/less/charset.c
+++ b/usr.bin/less/charset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: charset.c,v 1.2 2001/01/29 01:58:00 niklas Exp $	*/
+/*	$OpenBSD: charset.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -80,9 +80,9 @@ public int binattr = AT_STANDOUT;
 ichardef(s)
 	char *s;
 {
-	register char *cp;
-	register int n;
-	register char v;
+	char *cp;
+	int n;
+	char v;
 
 	n = 0;
 	v = 0;
@@ -135,9 +135,9 @@ ichardef(s)
  */
 	static int
 icharset(name)
-	register char *name;
+	char *name;
 {
-	register struct charset *p;
+	struct charset *p;
 
 	if (name == NULL || *name == '\0')
 		return (0);
@@ -163,7 +163,7 @@ icharset(name)
 	static void
 ilocale()
 {
-	register int c;
+	int c;
 
 	setlocale(LC_CTYPE, "");
 	for (c = 0;  c < sizeof(chardef);  c++)
@@ -211,7 +211,7 @@ setbinfmt(s)
 	public void
 init_charset()
 {
-	register char *s;
+	char *s;
 
 	s = getenv("LESSBINFMT");
 	setbinfmt(s);
diff --git a/usr.bin/less/cmdbuf.c b/usr.bin/less/cmdbuf.c
index 20c37b94006..7eac8c71525 100644
--- a/usr.bin/less/cmdbuf.c
+++ b/usr.bin/less/cmdbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmdbuf.c,v 1.2 2001/01/29 01:58:00 niklas Exp $	*/
+/*	$OpenBSD: cmdbuf.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -117,7 +117,7 @@ len_cmdbuf()
 	static int
 cmd_erase()
 {
-	register char *s;
+	char *s;
 	char *p;
 	int col;
 
diff --git a/usr.bin/less/command.c b/usr.bin/less/command.c
index 65dfc05eac2..f3548e8c060 100644
--- a/usr.bin/less/command.c
+++ b/usr.bin/less/command.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: command.c,v 1.3 2001/01/29 01:58:00 niklas Exp $	*/
+/*	$OpenBSD: command.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -163,7 +163,7 @@ mca_search()
 	static void
 exec_mca()
 {
-	register char *cbuf;
+	char *cbuf;
 
 	cmd_exec();
 	cbuf = get_cmdbuf();
@@ -412,7 +412,7 @@ mca_char(c)
 	static void
 prompt()
 {
-	register char *p;
+	char *p;
 
 	if (ungotp != NULL && ungotp > ungot)
 	{
@@ -566,7 +566,7 @@ ungetcc(c)
 ungetsc(s)
 	char *s;
 {
-	register char *p;
+	char *p;
 
 	for (p = s + strlen(s) - 1;  p >= s;  p--)
 		ungetcc(*p);
@@ -582,7 +582,7 @@ multi_search(pattern, n)
 	char *pattern;
 	int n;
 {
-	register int nomore;
+	int nomore;
 	IFILE save_ifile;
 	int changed_file;
 
@@ -662,9 +662,9 @@ multi_search(pattern, n)
 	public void
 commands()
 {
-	register int c;
-	register int action;
-	register char *cbuf;
+	int c;
+	int action;
+	char *cbuf;
 	int save_search_type;
 	char *s;
 	char tbuf[2];
diff --git a/usr.bin/less/decode.c b/usr.bin/less/decode.c
index 8fc0b1a0b92..07d4fd2b6e3 100644
--- a/usr.bin/less/decode.c
+++ b/usr.bin/less/decode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: decode.c,v 1.2 2001/01/29 01:58:01 niklas Exp $	*/
+/*	$OpenBSD: decode.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -228,7 +228,7 @@ add_cmd_table(tlist, buf, len)
 	char *buf;
 	int len;
 {
-	register struct tablelist *t;
+	struct tablelist *t;
 
 	if (len == 0)
 		return (0);
@@ -282,9 +282,9 @@ cmd_search(cmd, table, endtable, sp)
 	char *endtable;
 	char **sp;
 {
-	register char *p;
-	register char *q;
-	register int a;
+	char *p;
+	char *q;
+	int a;
 
 	for (p = table, q = cmd;  p < endtable;  p++, q++)
 	{
@@ -367,8 +367,8 @@ cmd_decode(tlist, cmd, sp)
 	char *cmd;
 	char **sp;
 {
-	register struct tablelist *t;
-	register int action = A_INVALID;
+	struct tablelist *t;
+	int action = A_INVALID;
 
 	/*
 	 * Search thru all the command tables.
@@ -441,9 +441,9 @@ new_lesskey(buf, len)
 	int len;
 {
 	char *p;
-	register int c;
-	register int done;
-	register int n;
+	int c;
+	int done;
+	int n;
 
 	/*
 	 * New-style lesskey file.
@@ -488,10 +488,10 @@ new_lesskey(buf, len)
 lesskey(filename)
 	char *filename;
 {
-	register char *buf;
-	register POSITION len;
-	register long n;
-	register int f;
+	char *buf;
+	POSITION len;
+	long n;
+	int f;
 
 	/*
 	 * Try to open the lesskey file.
diff --git a/usr.bin/less/doscreen.c b/usr.bin/less/doscreen.c
index 5d287d41931..9281f0a8710 100644
--- a/usr.bin/less/doscreen.c
+++ b/usr.bin/less/doscreen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: doscreen.c,v 1.2 2001/01/29 01:58:01 niklas Exp $	*/
+/*	$OpenBSD: doscreen.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -105,7 +105,7 @@ scrsize(p_height, p_width)
 	int *p_height;
 	int *p_width;
 {
-	register char *s;
+	char *s;
 	struct videoconfig w;
 
 	_getvideoconfig(&w);
diff --git a/usr.bin/less/edit.c b/usr.bin/less/edit.c
index 0f07a3f7e6e..47e1f0bfbca 100644
--- a/usr.bin/less/edit.c
+++ b/usr.bin/less/edit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: edit.c,v 1.2 2001/01/29 01:58:01 niklas Exp $	*/
+/*	$OpenBSD: edit.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -555,7 +555,7 @@ edit_stdin()
 	public void
 cat_file()
 {
-	register int c;
+	int c;
 
 	while ((c = ch_forw_get()) != EOI)
 		putchr(c);
@@ -573,8 +573,8 @@ cat_file()
 use_logfile(filename)
 	char *filename;
 {
-	register int exists;
-	register int answer;
+	int exists;
+	int answer;
 	PARG parg;
 
 	if (ch_getflags() & CH_CANSEEK)
diff --git a/usr.bin/less/filename.c b/usr.bin/less/filename.c
index 9999031b765..28bacff3278 100644
--- a/usr.bin/less/filename.c
+++ b/usr.bin/less/filename.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filename.c,v 1.2 2001/01/29 01:58:01 niklas Exp $	*/
+/*	$OpenBSD: filename.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -89,7 +89,7 @@ dirfile(dirname, filename)
 homefile(filename)
 	char *filename;
 {
-	register char *pathname;
+	char *pathname;
 
 	/*
 	 * Try $HOME/filename.
@@ -124,7 +124,7 @@ homefile(filename)
 	public char *
 find_helpfile()
 {
-	register char *helpfile;
+	char *helpfile;
 	
 	if ((helpfile = getenv("LESSHELP")) != NULL)
 		return (save(helpfile));
@@ -144,9 +144,9 @@ find_helpfile()
 fexpand(s)
 	char *s;
 {
-	register char *fr, *to;
-	register int n;
-	register char *e;
+	char *fr, *to;
+	int n;
+	char *e;
 
 	/*
 	 * Make one pass to see how big a buffer we 
@@ -542,10 +542,10 @@ close_altfile(altfilename, filename, pipefd)
 glob(filename)
 	char *filename;
 {
-	register char *gfilename;
-	register char *p;
-	register int len;
-	register int n;
+	char *gfilename;
+	char *p;
+	int len;
+	int n;
 	struct find_t fnd;
 	char drive[_MAX_DRIVE];
 	char dir[_MAX_DIR];
@@ -642,7 +642,7 @@ close_altfile(altfilename, filename)
 bad_file(filename)
 	char *filename;
 {
-	register char *m;
+	char *m;
 	struct stat statbuf;
 
 	if (stat(filename, &statbuf) < 0)
diff --git a/usr.bin/less/forwback.c b/usr.bin/less/forwback.c
index f73d57fdb1a..d316ce74b59 100644
--- a/usr.bin/less/forwback.c
+++ b/usr.bin/less/forwback.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: forwback.c,v 1.3 2001/01/29 01:58:01 niklas Exp $	*/
+/*	$OpenBSD: forwback.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -114,7 +114,7 @@ squish_check()
  */
 	public void
 forw(n, pos, force, only_last, nblank)
-	register int n;
+	int n;
 	POSITION pos;
 	int force;
 	int only_last;
@@ -263,7 +263,7 @@ forw(n, pos, force, only_last, nblank)
  */
 	public void
 back(n, pos, force, only_last)
-	register int n;
+	int n;
 	POSITION pos;
 	int force;
 	int only_last;
diff --git a/usr.bin/less/ifile.c b/usr.bin/less/ifile.c
index 59cd9d089be..c71bc79cb40 100644
--- a/usr.bin/less/ifile.c
+++ b/usr.bin/less/ifile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifile.c,v 1.2 2001/01/29 01:58:02 niklas Exp $	*/
+/*	$OpenBSD: ifile.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -67,7 +67,7 @@ static int ifiles = 0;
 
 	static void
 incr_index(p, incr)
-	register struct ifile *p;
+	struct ifile *p;
 	int incr;
 {
 	for (;  p != &anchor;  p = p->h_next)
@@ -118,7 +118,7 @@ new_ifile(filename, prev)
 	char *filename;
 	struct ifile *prev;
 {
-	register struct ifile *p;
+	struct ifile *p;
 
 	/*
 	 * Allocate and initialize structure.
@@ -138,7 +138,7 @@ new_ifile(filename, prev)
 del_ifile(h)
 	IFILE h;
 {
-	register struct ifile *p;
+	struct ifile *p;
 
 	if (h == NULL_IFILE)
 		return;
@@ -161,7 +161,7 @@ del_ifile(h)
 next_ifile(h)
 	IFILE h;
 {
-	register struct ifile *p;
+	struct ifile *p;
 
 	p = (h == NULL_IFILE) ? &anchor : int_ifile(h);
 	if (p->h_next == &anchor)
@@ -176,7 +176,7 @@ next_ifile(h)
 prev_ifile(h)
 	IFILE h;
 {
-	register struct ifile *p;
+	struct ifile *p;
 
 	p = (h == NULL_IFILE) ? &anchor : int_ifile(h);
 	if (p->h_prev == &anchor)
@@ -216,7 +216,7 @@ nifile()
 find_ifile(filename)
 	char *filename;
 {
-	register struct ifile *p;
+	struct ifile *p;
 
 	for (p = anchor.h_next;  p != &anchor;  p = p->h_next)
 		if (strcmp(filename, p->h_filename) == 0)
@@ -234,7 +234,7 @@ get_ifile(filename, prev)
 	char *filename;
 	IFILE prev;
 {
-	register struct ifile *p;
+	struct ifile *p;
 
 	if ((p = find_ifile(filename)) == NULL)
 		p = new_ifile(filename, int_ifile(prev));
@@ -325,7 +325,7 @@ set_filestate(ifile, filestate)
 	public void
 if_dump()
 {
-	register struct ifile *p;
+	struct ifile *p;
 
 	for (p = anchor.h_next;  p != &anchor;  p = p->h_next)
 	{
diff --git a/usr.bin/less/input.c b/usr.bin/less/input.c
index 8fbc1f4e0c8..750f50a647a 100644
--- a/usr.bin/less/input.c
+++ b/usr.bin/less/input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: input.c,v 1.2 2001/01/29 01:58:02 niklas Exp $	*/
+/*	$OpenBSD: input.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -59,7 +59,7 @@ forw_line(curr_pos)
 	POSITION curr_pos;
 {
 	POSITION new_pos;
-	register int c;
+	int c;
 	int blankline;
 	int endline;
 
diff --git a/usr.bin/less/jump.c b/usr.bin/less/jump.c
index 21ccd76740b..c93fb0af34c 100644
--- a/usr.bin/less/jump.c
+++ b/usr.bin/less/jump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: jump.c,v 1.2 2001/01/29 01:58:02 niklas Exp $	*/
+/*	$OpenBSD: jump.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -181,7 +181,7 @@ jump_loc(pos, sline)
 	POSITION pos;
 	int sline;
 {
-	register int nline;
+	int nline;
 	POSITION tpos;
 	POSITION bpos;
 
diff --git a/usr.bin/less/lesskey.c b/usr.bin/less/lesskey.c
index de646c1c1b3..ed662ada4ac 100644
--- a/usr.bin/less/lesskey.c
+++ b/usr.bin/less/lesskey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lesskey.c,v 1.2 2001/01/29 01:58:02 niklas Exp $	*/
+/*	$OpenBSD: lesskey.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -319,9 +319,9 @@ init_tables()
 tchar(pp)
 	char **pp;
 {
-	register char *p;
-	register char ch;
-	register int i;
+	char *p;
+	char ch;
+	int i;
 
 	p = *pp;
 	switch (*p)
@@ -381,7 +381,7 @@ tchar(pp)
  */
 	public char *
 skipsp(s)
-	register char *s;
+	char *s;
 {
 	while (*s == ' ' || *s == '\t')	
 		s++;
@@ -393,7 +393,7 @@ skipsp(s)
  */
 	public char *
 skipnsp(s)
-	register char *s;
+	char *s;
 {
 	while (*s != '\0' && *s != ' ' && *s != '\t')
 		s++;
@@ -408,7 +408,7 @@ skipnsp(s)
 clean_line(s)
 	char *s;
 {
-	register int i;
+	int i;
 
 	s = skipsp(s);
 	for (i = 0;  s[i] != '\n' && s[i] != '\0';  i++)
diff --git a/usr.bin/less/line.c b/usr.bin/less/line.c
index 3a4e8f5187f..365a31d5d89 100644
--- a/usr.bin/less/line.c
+++ b/usr.bin/less/line.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: line.c,v 1.2 2001/01/29 01:58:02 niklas Exp $	*/
+/*	$OpenBSD: line.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -84,9 +84,9 @@ prewind()
 plinenum(pos)
 	POSITION pos;
 {
-	register int lno;
-	register int i;
-	register int n;
+	int lno;
+	int i;
+	int n;
 
 	/*
 	 * We display the line number at the start of each line
@@ -172,7 +172,7 @@ pwidth(c, a)
 	int c;
 	int a;
 {
-	register int w;
+	int w;
 
 	if (c == '\b')
 		/*
@@ -219,7 +219,7 @@ storec(c, a, pos)
 	int a;
 	POSITION pos;
 {
-	register int w;
+	int w;
 
 #if HILITE_SEARCH
 	if (is_hilited(pos, pos+1, 0))
@@ -288,7 +288,7 @@ storec(c, a, pos)
  */
 	public int
 pappend(c, pos)
-	register int c;
+	int c;
 	POSITION pos;
 {
 	if (pendc)
@@ -322,8 +322,8 @@ do_append(c, pos)
 	int c;
 	POSITION pos;
 {
-	register char *s;
-	register int a;
+	char *s;
+	int a;
 
 #define	STOREC(c,a) \
 	if (storec((c),(a),pos)) return (1); else curr++
@@ -447,8 +447,8 @@ pdone(endline)
  */
 	public int
 gline(i, ap)
-	register int i;
-	register int *ap;
+	int i;
+	int *ap;
 {
 	char *s;
 	
@@ -487,8 +487,8 @@ forw_raw_line(curr_pos, linep)
 	POSITION curr_pos;
 	char **linep;
 {
-	register char *p;
-	register int c;
+	char *p;
+	int c;
 	POSITION new_pos;
 
 	if (curr_pos == NULL_POSITION || ch_seek(curr_pos) ||
@@ -533,8 +533,8 @@ back_raw_line(curr_pos, linep)
 	POSITION curr_pos;
 	char **linep;
 {
-	register char *p;
-	register int c;
+	char *p;
+	int c;
 	POSITION new_pos;
 
 	if (curr_pos == NULL_POSITION || curr_pos <= ch_zero() ||
diff --git a/usr.bin/less/linenum.c b/usr.bin/less/linenum.c
index f00089317b7..6aae1a7ae0a 100644
--- a/usr.bin/less/linenum.c
+++ b/usr.bin/less/linenum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linenum.c,v 1.2 2001/01/29 01:58:02 niklas Exp $	*/
+/*	$OpenBSD: linenum.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -96,7 +96,7 @@ extern int sc_height;
 	public void
 clr_linenum()
 {
-	register struct linenum *p;
+	struct linenum *p;
 
 	/*
 	 * Put all the entries on the free list.
@@ -123,7 +123,7 @@ clr_linenum()
  */
 	static void
 calcgap(p)
-	register struct linenum *p;
+	struct linenum *p;
 {
 	/*
 	 * Don't bother to compute a gap for the anchor.
@@ -146,11 +146,11 @@ add_lnum(lno, pos)
 	int lno;
 	POSITION pos;
 {
-	register struct linenum *p;
-	register struct linenum *new;
-	register struct linenum *nextp;
-	register struct linenum *prevp;
-	register POSITION mingap;
+	struct linenum *p;
+	struct linenum *new;
+	struct linenum *nextp;
+	struct linenum *prevp;
+	POSITION mingap;
 
 	/*
 	 * Find the proper place in the list for the new one.
@@ -276,8 +276,8 @@ longish()
 find_linenum(pos)
 	POSITION pos;
 {
-	register struct linenum *p;
-	register int lno;
+	struct linenum *p;
+	int lno;
 	POSITION cpos;
 
 	if (!linenums)
@@ -386,7 +386,7 @@ find_linenum(pos)
 find_pos(lno)
 	int lno;
 {
-	register struct linenum *p;
+	struct linenum *p;
 	POSITION cpos;
 	int clno;
 
diff --git a/usr.bin/less/lsystem.c b/usr.bin/less/lsystem.c
index cdc6933f62b..cda57942c5c 100644
--- a/usr.bin/less/lsystem.c
+++ b/usr.bin/less/lsystem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsystem.c,v 1.2 2001/01/29 01:58:02 niklas Exp $	*/
+/*	$OpenBSD: lsystem.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -54,12 +54,12 @@ extern IFILE curr_ifile;
 lsystem(cmd)
 	char *cmd;
 {
-	register int inp;
+	int inp;
 #if MSOFTC || OS2
-	register int inp2;
+	int inp2;
 #endif
-	register char *shell;
-	register char *p;
+	char *shell;
+	char *p;
 	IFILE save_ifile;
 
 	/*
@@ -224,8 +224,8 @@ pipe_data(cmd, spos, epos)
 	POSITION spos;
 	POSITION epos;
 {
-	register FILE *f;
-	register int c;
+	FILE *f;
+	int c;
 	extern FILE *popen();
 
 	/*
diff --git a/usr.bin/less/main.c b/usr.bin/less/main.c
index a7809f3791b..13636365bf4 100644
--- a/usr.bin/less/main.c
+++ b/usr.bin/less/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.4 2001/01/29 01:58:03 niklas Exp $	*/
+/*	$OpenBSD: main.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -282,7 +282,7 @@ strtcpy(to, from, len)
 save(s)
 	char *s;
 {
-	register char *p;
+	char *p;
 
 	p = (char *) ecalloc(strlen(s)+1, sizeof(char));
 	strcpy(p, s);
@@ -298,7 +298,7 @@ ecalloc(count, size)
 	int count;
 	unsigned int size;
 {
-	register VOID_POINTER p;
+	VOID_POINTER p;
 
 	p = (VOID_POINTER) calloc(count, size);
 	if (p != NULL)
@@ -313,7 +313,7 @@ ecalloc(count, size)
  */
 	public char *
 skipsp(s)
-	register char *s;
+	char *s;
 {
 	while (*s == ' ' || *s == '\t')	
 		s++;
diff --git a/usr.bin/less/mark.c b/usr.bin/less/mark.c
index 18befbee464..4641a29385b 100644
--- a/usr.bin/less/mark.c
+++ b/usr.bin/less/mark.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mark.c,v 1.2 2001/01/29 01:58:03 niklas Exp $	*/
+/*	$OpenBSD: mark.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -93,7 +93,7 @@ getumark(c)
 getmark(c)
 	int c;
 {
-	register struct mark *m;
+	struct mark *m;
 	static struct mark sm;
 
 	switch (c)
@@ -170,7 +170,7 @@ badmark(c)
 setmark(c)
 	int c;
 {
-	register struct mark *m;
+	struct mark *m;
 	struct scrpos scrpos;
 
 	m = getumark(c);
@@ -203,7 +203,7 @@ lastmark()
 gomark(c)
 	int c;
 {
-	register struct mark *m;
+	struct mark *m;
 	struct scrpos scrpos;
 
 	m = getmark(c);
@@ -251,7 +251,7 @@ gomark(c)
 markpos(c)
 	int c;
 {
-	register struct mark *m;
+	struct mark *m;
 
 	m = getmark(c);
 	if (m == NULL)
diff --git a/usr.bin/less/optfunc.c b/usr.bin/less/optfunc.c
index ab5f4e84e1f..c228612022e 100644
--- a/usr.bin/less/optfunc.c
+++ b/usr.bin/less/optfunc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: optfunc.c,v 1.2 2001/01/29 01:58:03 niklas Exp $	*/
+/*	$OpenBSD: optfunc.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -252,7 +252,7 @@ opt__T(type, s)
 	public void
 opt_p(type, s)
 	int type;
-	register char *s;
+	char *s;
 {
 	switch (type)
 	{
@@ -275,9 +275,9 @@ opt_p(type, s)
 	public void
 opt__P(type, s)
 	int type;
-	register char *s;
+	char *s;
 {
-	register char **proto;
+	char **proto;
 	PARG parg;
 
 	switch (type)
diff --git a/usr.bin/less/option.c b/usr.bin/less/option.c
index 7f2a74eea7c..ad44cb60af6 100644
--- a/usr.bin/less/option.c
+++ b/usr.bin/less/option.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: option.c,v 1.2 2001/01/29 01:58:03 niklas Exp $	*/
+/*	$OpenBSD: option.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -57,8 +57,8 @@ extern char *every_first_cmd;
 scan_option(s)
 	char *s;
 {
-	register struct option *o;
-	register int c;
+	struct option *o;
+	int c;
 	char *str;
 	int set_default;
 	PARG parg;
@@ -207,8 +207,8 @@ toggle_option(c, s, how_toggle)
 	char *s;
 	int how_toggle;
 {
-	register struct option *o;
-	register int num;
+	struct option *o;
+	int num;
 	int err;
 	PARG parg;
 
@@ -420,7 +420,7 @@ propt(c)
 single_char_option(c)
 	int c;
 {
-	register struct option *o;
+	struct option *o;
 
 	o = findopt(c);
 	if (o == NULL)
@@ -436,7 +436,7 @@ single_char_option(c)
 opt_prompt(c)
 	int c;
 {
-	register struct option *o;
+	struct option *o;
 
 	o = findopt(c);
 	if (o == NULL || (o->otype & (STRING|NUMBER)) == 0)
@@ -488,7 +488,7 @@ optstring(s, c)
 	char *s;
 	int c;
 {
-	register char *p;
+	char *p;
 
 	if (*s == '\0')
 	{
@@ -515,9 +515,9 @@ getnum(sp, c, errp)
 	int c;
 	int *errp;
 {
-	register char *s;
-	register int n;
-	register int neg;
+	char *s;
+	int n;
+	int neg;
 	PARG parg;
 
 	s = skipsp(*sp);
diff --git a/usr.bin/less/opttbl.c b/usr.bin/less/opttbl.c
index a5255008fac..6b9fdbd95a0 100644
--- a/usr.bin/less/opttbl.c
+++ b/usr.bin/less/opttbl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opttbl.c,v 1.4 2001/01/29 01:58:03 niklas Exp $	*/
+/*	$OpenBSD: opttbl.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -252,7 +252,7 @@ static struct option option[] =
 	public void
 init_option()
 {
-	register struct option *o;
+	struct option *o;
 
 	for (o = option;  o->oletter != '\0';  o++)
 	{
@@ -271,7 +271,7 @@ init_option()
 findopt(c)
 	int c;
 {
-	register struct option *o;
+	struct option *o;
 
 	for (o = option;  o->oletter != '\0';  o++)
 	{
diff --git a/usr.bin/less/os.c b/usr.bin/less/os.c
index 6fa51605136..27953952806 100644
--- a/usr.bin/less/os.c
+++ b/usr.bin/less/os.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: os.c,v 1.3 2001/01/29 01:58:03 niklas Exp $	*/
+/*	$OpenBSD: os.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -89,7 +89,7 @@ iread(fd, buf, len)
 	char *buf;
 	unsigned int len;
 {
-	register int n;
+	int n;
 
 #if MSOFTC
 	if (kbhit())
@@ -177,8 +177,8 @@ strerror(err)
 errno_message(filename)
 	char *filename;
 {
-	register char *p;
-	register char *m;
+	char *p;
+	char *m;
 #if HAVE_ERRNO
 	extern int errno;
 	p = strerror(errno);
diff --git a/usr.bin/less/output.c b/usr.bin/less/output.c
index 9a3d03db0b7..e44e8d614fe 100644
--- a/usr.bin/less/output.c
+++ b/usr.bin/less/output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: output.c,v 1.3 2001/01/29 01:58:03 niklas Exp $	*/
+/*	$OpenBSD: output.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -48,8 +48,8 @@ extern int any_display;
 	public void
 put_line()
 {
-	register int c;
-	register int i;
+	int c;
+	int i;
 	int a;
 	int curr_attr;
 
@@ -128,8 +128,8 @@ static char *ob = obuf;
 	public void
 flush()
 {
-	register int n;
-	register int fd;
+	int n;
+	int fd;
 
 #if MSOFTC
 	*ob = '\0';
@@ -173,7 +173,7 @@ putchr(c)
  */
 	public void
 putstr(s)
-	register char *s;
+	char *s;
 {
 	while (*s != '\0')
 		putchr(*s++);
@@ -188,7 +188,7 @@ iprintnum(num, radix)
 	int num;
 	int radix;
 {
-	register char *s;
+	char *s;
 	int r;
 	int neg;
 	char buf[10];
@@ -217,12 +217,12 @@ iprintnum(num, radix)
  */
 	static int
 iprintf(fmt, parg)
-	register char *fmt;
+	char *fmt;
 	PARG *parg;
 {
-	register char *s;
-	register int n;
-	register int col;
+	char *s;
+	int n;
+	int col;
 
 	col = 0;
 	while (*fmt != '\0')
@@ -343,7 +343,7 @@ query(fmt, parg)
 	char *fmt;
 	PARG *parg;
 {
-	register int c;
+	int c;
 	int col = 0;
 
 	if (any_display)
diff --git a/usr.bin/less/position.c b/usr.bin/less/position.c
index 77e1b262cfa..13869affb0b 100644
--- a/usr.bin/less/position.c
+++ b/usr.bin/less/position.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: position.c,v 1.3 2001/01/29 01:58:03 niklas Exp $	*/
+/*	$OpenBSD: position.c,v 1.4 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -82,7 +82,7 @@ position(where)
 add_forw_pos(pos)
 	POSITION pos;
 {
-	register int i;
+	int i;
 
 	/*
 	 * Scroll the position table up.
@@ -99,7 +99,7 @@ add_forw_pos(pos)
 add_back_pos(pos)
 	POSITION pos;
 {
-	register int i;
+	int i;
 
 	/*
 	 * Scroll the position table down.
@@ -115,7 +115,7 @@ add_back_pos(pos)
 	public void
 pos_clear()
 {
-	register int i;
+	int i;
 
 	for (i = 0;  i < sc_height;  i++)
 		table[i] = NULL_POSITION;
@@ -157,7 +157,7 @@ pos_init()
 onscreen(pos)
 	POSITION pos;
 {
-	register int i;
+	int i;
 
 	if (pos < table[0])
 		return (-1);
@@ -181,7 +181,7 @@ empty_lines(s, e)
 	int s;
 	int e;
 {
-	register int i;
+	int i;
 
 	for (i = s;  i <= e;  i++)
 		if (table[i] != NULL_POSITION)
@@ -201,7 +201,7 @@ empty_lines(s, e)
 get_scrpos(scrpos)
 	struct scrpos *scrpos;
 {
-	register int i;
+	int i;
 
 	/*
 	 * Find the first line on the screen which has something on it,
diff --git a/usr.bin/less/prompt.c b/usr.bin/less/prompt.c
index 19c7ad0f14c..1ced56ae415 100644
--- a/usr.bin/less/prompt.c
+++ b/usr.bin/less/prompt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prompt.c,v 1.4 2001/01/29 01:58:03 niklas Exp $	*/
+/*	$OpenBSD: prompt.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -287,9 +287,9 @@ protochar(c, where)
  */
 	static char *
 skipcond(p)
-	register char *p;
+	char *p;
 {
-	register int iflevel;
+	int iflevel;
 
 	/*
 	 * We came in here after processing a ? or :,
@@ -369,8 +369,8 @@ pr_expand(proto, maxwidth)
 	char *proto;
 	int maxwidth;
 {
-	register char *p;
-	register int c;
+	char *p;
+	int c;
 	int where;
 
 	mp = message;
diff --git a/usr.bin/less/regexp.c b/usr.bin/less/regexp.c
index ba1f2744ae9..41bfcf22479 100644
--- a/usr.bin/less/regexp.c
+++ b/usr.bin/less/regexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regexp.c,v 1.2 2001/01/29 01:58:04 niklas Exp $	*/
+/*	$OpenBSD: regexp.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * regcomp and regexec -- regsub and regerror are elsewhere
@@ -202,10 +202,10 @@ regexp *
 regcomp(exp)
 char *exp;
 {
-	register regexp *r;
-	register char *scan;
-	register char *longest;
-	register int len;
+	regexp *r;
+	char *scan;
+	char *longest;
+	int len;
 	int flags;
 
 	if (exp == NULL)
@@ -290,10 +290,10 @@ reg(paren, flagp)
 int paren;			/* Parenthesized? */
 int *flagp;
 {
-	register char *ret;
-	register char *br;
-	register char *ender;
-	register int parno = 0;
+	char *ret;
+	char *br;
+	char *ender;
+	int parno = 0;
 	int flags;
 
 	*flagp = HASWIDTH;	/* Tentatively. */
@@ -361,9 +361,9 @@ static char *
 regbranch(flagp)
 int *flagp;
 {
-	register char *ret;
-	register char *chain;
-	register char *latest;
+	char *ret;
+	char *chain;
+	char *latest;
 	int flags;
 
 	*flagp = WORST;		/* Tentatively. */
@@ -400,9 +400,9 @@ static char *
 regpiece(flagp)
 int *flagp;
 {
-	register char *ret;
-	register char op;
-	register char *next;
+	char *ret;
+	char op;
+	char *next;
 	int flags;
 
 	ret = regatom(&flags);
@@ -464,7 +464,7 @@ static char *
 regatom(flagp)
 int *flagp;
 {
-	register char *ret;
+	char *ret;
 	int flags;
 
 	*flagp = WORST;		/* Tentatively. */
@@ -481,8 +481,8 @@ int *flagp;
 		*flagp |= HASWIDTH|SIMPLE;
 		break;
 	case '[': {
-			register int clss;
-			register int classend;
+			int clss;
+			int classend;
 
 			if (*regparse == '^') {	/* Complement of range. */
 				ret = regnode(ANYBUT);
@@ -542,8 +542,8 @@ int *flagp;
 		*flagp |= HASWIDTH|SIMPLE;
 		break;
 	default: {
-			register int len;
-			register char ender;
+			int len;
+			char ender;
 
 			regparse--;
 			len = strcspn(regparse, META);
@@ -575,8 +575,8 @@ static char *			/* Location. */
 regnode(op)
 char op;
 {
-	register char *ret;
-	register char *ptr;
+	char *ret;
+	char *ptr;
 
 	ret = regcode;
 	if (ret == &regdummy) {
@@ -616,9 +616,9 @@ reginsert(op, opnd)
 char op;
 char *opnd;
 {
-	register char *src;
-	register char *dst;
-	register char *place;
+	char *src;
+	char *dst;
+	char *place;
 
 	if (regcode == &regdummy) {
 		regsize += 3;
@@ -645,9 +645,9 @@ regtail(p, val)
 char *p;
 char *val;
 {
-	register char *scan;
-	register char *temp;
-	register int offset;
+	char *scan;
+	char *temp;
+	int offset;
 
 	if (p == &regdummy)
 		return;
@@ -713,10 +713,10 @@ STATIC char *regprop();
  */
 int
 regexec(prog, string)
-register regexp *prog;
-register char *string;
+regexp *prog;
+char *string;
 {
-	register char *s;
+	char *s;
 
 	/* Be paranoid... */
 	if (prog == NULL || string == NULL) {
@@ -777,9 +777,9 @@ regtry(prog, string)
 regexp *prog;
 char *string;
 {
-	register int i;
-	register char **sp;
-	register char **ep;
+	int i;
+	char **sp;
+	char **ep;
 
 	reginput = string;
 	regstartp = prog->startp;
@@ -813,7 +813,7 @@ static int			/* 0 failure, 1 success */
 regmatch(prog)
 char *prog;
 {
-	register char *scan;	/* Current node. */
+	char *scan;	/* Current node. */
 	char *next;		/* Next node. */
 
 	scan = prog;
@@ -843,8 +843,8 @@ char *prog;
 			reginput++;
 			break;
 		case EXACTLY: {
-				register int len;
-				register char *opnd;
+				int len;
+				char *opnd;
 
 				opnd = OPERAND(scan);
 				/* Inline the first character, for speed. */
@@ -879,8 +879,8 @@ char *prog;
 		case OPEN+7:
 		case OPEN+8:
 		case OPEN+9: {
-				register int no;
-				register char *save;
+				int no;
+				char *save;
 
 				no = OP(scan) - OPEN;
 				save = reginput;
@@ -908,8 +908,8 @@ char *prog;
 		case CLOSE+7:
 		case CLOSE+8:
 		case CLOSE+9: {
-				register int no;
-				register char *save;
+				int no;
+				char *save;
 
 				no = OP(scan) - CLOSE;
 				save = reginput;
@@ -929,7 +929,7 @@ char *prog;
 			/* NOTREACHED */
 			break;
 		case BRANCH: {
-				register char *save;
+				char *save;
 
 				if (OP(next) != BRANCH)		/* No choice. */
 					next = OPERAND(scan);	/* Avoid recursion. */
@@ -949,10 +949,10 @@ char *prog;
 			break;
 		case STAR:
 		case PLUS: {
-				register char nextch;
-				register int no;
-				register char *save;
-				register int min;
+				char nextch;
+				int no;
+				char *save;
+				int min;
 
 				/*
 				 * Lookahead to avoid useless match attempts
@@ -1006,9 +1006,9 @@ static int
 regrepeat(p)
 char *p;
 {
-	register int count = 0;
-	register char *scan;
-	register char *opnd;
+	int count = 0;
+	char *scan;
+	char *opnd;
 
 	scan = reginput;
 	opnd = OPERAND(p);
@@ -1050,9 +1050,9 @@ char *p;
  */
 static char *
 regnext(p)
-register char *p;
+char *p;
 {
-	register int offset;
+	int offset;
 
 	if (p == &regdummy)
 		return(NULL);
@@ -1078,9 +1078,9 @@ void
 regdump(r)
 regexp *r;
 {
-	register char *s;
-	register char op = EXACTLY;	/* Arbitrary non-END op. */
-	register char *next;
+	char *s;
+	char op = EXACTLY;	/* Arbitrary non-END op. */
+	char *next;
 
 
 	s = r->program + 1;
@@ -1121,7 +1121,7 @@ static char *
 regprop(op)
 char *op;
 {
-	register char *p;
+	char *p;
 	static char buf[50];
 
 	(void) strcpy(buf, ":");
@@ -1214,9 +1214,9 @@ strcspn(s1, s2)
 char *s1;
 char *s2;
 {
-	register char *scan1;
-	register char *scan2;
-	register int count;
+	char *scan1;
+	char *scan2;
+	int count;
 
 	count = 0;
 	for (scan1 = s1; *scan1 != '\0'; scan1++) {
diff --git a/usr.bin/less/screen.c b/usr.bin/less/screen.c
index 2e686b0d808..ae291b8019a 100644
--- a/usr.bin/less/screen.c
+++ b/usr.bin/less/screen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: screen.c,v 1.7 2001/01/29 01:58:04 niklas Exp $	*/
+/*	$OpenBSD: screen.c,v 1.8 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -453,7 +453,7 @@ scrsize()
 	public void
 scrsize()
 {
-	register char *s;
+	char *s;
 #ifdef TIOCGWINSZ
 	struct winsize w;
 #else
@@ -673,8 +673,8 @@ get_debug_term()
 get_term()
 {
 	char *sp;
-	register char *t1, *t2;
-	register int hard;
+	char *t1, *t2;
+	int hard;
 	char *term;
 	char termbuf[2048];
 
diff --git a/usr.bin/less/search.c b/usr.bin/less/search.c
index 0c5624b9365..0e8c3a15716 100644
--- a/usr.bin/less/search.c
+++ b/usr.bin/less/search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.c,v 1.2 2001/01/29 01:58:04 niklas Exp $	*/
+/*	$OpenBSD: search.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -116,8 +116,8 @@ cvt_text(odst, osrc, ops)
 	char *osrc;
 	int ops;
 {
-	register char *dst;
-	register char *src;
+	char *dst;
+	char *src;
 
 	for (src = osrc, dst = odst;  *src != '\0';  src++, dst++)
 	{
@@ -141,7 +141,7 @@ cvt_text(odst, osrc, ops)
 is_ucase(s)
 	char *s;
 {
-	register char *p;
+	char *p;
 
 	for (p = s;  *p != '\0';  p++)
 		if (isupper(*p))
@@ -1143,7 +1143,7 @@ match(pattern, buf, pfound, pend)
 	char *pattern, *buf;
 	char **pfound, **pend;
 {
-	register char *pp, *lp;
+	char *pp, *lp;
 
 	for ( ;  *buf != '\0';  buf++)
 	{
diff --git a/usr.bin/less/signal.c b/usr.bin/less/signal.c
index b3e3e0bab9c..a7728f6b7ab 100644
--- a/usr.bin/less/signal.c
+++ b/usr.bin/less/signal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.c,v 1.2 2001/01/29 01:58:04 niklas Exp $	*/
+/*	$OpenBSD: signal.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -165,7 +165,7 @@ init_signals(on)
 	public void
 psignals()
 {
-	register int tsignals;
+	int tsignals;
 
 	if ((tsignals = sigs) == 0)
 		return;
diff --git a/usr.bin/less/tags.c b/usr.bin/less/tags.c
index 790fc018577..f7f05bdc1d1 100644
--- a/usr.bin/less/tags.c
+++ b/usr.bin/less/tags.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tags.c,v 1.2 2001/01/29 01:58:04 niklas Exp $	*/
+/*	$OpenBSD: tags.c,v 1.3 2001/11/19 19:02:14 mpech Exp $	*/
 
 /*
  * Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman
@@ -51,12 +51,12 @@ extern int jump_sline;
  */
 	public void
 findtag(tag)
-	register char *tag;
+	char *tag;
 {
 	char *p;
 	char *q;
-	register FILE *f;
-	register int taglen;
+	FILE *f;
+	int taglen;
 	int search_char;
 	int err;
 	static char tline[200];
diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c
index 7565e38e26f..ffdee5403bf 100644
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccl.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
+/*	$OpenBSD: ccl.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* ccl - routines for character classes */
 
@@ -28,7 +28,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/ccl.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/ccl.c,v 1.5 2001/11/19 19:02:14 mpech Exp $ */
 
 #include "flexdef.h"
 
@@ -122,7 +122,7 @@ void list_character_set( file, cset )
 FILE *file;
 int cset[];
 	{
-	register int i;
+	int i;
 
 	putc( '[', file );
 
@@ -130,7 +130,7 @@ int cset[];
 		{
 		if ( cset[i] )
 			{
-			register int start_char = i;
+			int start_char = i;
 
 			putc( ' ', file );
 
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
index 5f459f96da1..a2b437a0543 100644
--- a/usr.bin/lex/dfa.c
+++ b/usr.bin/lex/dfa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
+/*	$OpenBSD: dfa.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* dfa - DFA construction routines */
 
@@ -28,7 +28,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/dfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/dfa.c,v 1.5 2001/11/19 19:02:14 mpech Exp $ */
 
 #include "flexdef.h"
 
@@ -105,13 +105,13 @@ int *nfa_states, num_states;
 int *accset;
 int nacc;
 	{
-	register int i, j;
+	int i, j;
 
 	for ( i = 1; i <= num_states; ++i )
 		{
 		int ns = nfa_states[i];
-		register int type = state_type[ns];
-		register int ar = assoc_rule[ns];
+		int type = state_type[ns];
+		int ar = assoc_rule[ns];
 
 		if ( type == STATE_NORMAL || rule_type[ar] != RULE_VARIABLE )
 			{ /* do nothing */
@@ -149,15 +149,15 @@ void dump_associated_rules( file, ds )
 FILE *file;
 int ds;
 	{
-	register int i, j;
-	register int num_associated_rules = 0;
+	int i, j;
+	int num_associated_rules = 0;
 	int rule_set[MAX_ASSOC_RULES + 1];
 	int *dset = dss[ds];
 	int size = dfasiz[ds];
 
 	for ( i = 1; i <= size; ++i )
 		{
-		register int rule_num = rule_linenum[assoc_rule[dset[i]]];
+		int rule_num = rule_linenum[assoc_rule[dset[i]]];
 
 		for ( j = 1; j <= num_associated_rules; ++j )
 			if ( rule_num == rule_set[j] )
@@ -201,7 +201,7 @@ void dump_transitions( file, state )
 FILE *file;
 int state[];
 	{
-	register int i, ec;
+	int i, ec;
 	int out_char_set[CSIZE];
 
 	for ( i = 0; i < csize; ++i )
@@ -249,7 +249,7 @@ int state[];
 int *epsclosure( t, ns_addr, accset, nacc_addr, hv_addr )
 int *t, *ns_addr, accset[], *nacc_addr, *hv_addr;
 	{
-	register int stkpos, ns, tsp;
+	int stkpos, ns, tsp;
 	int numstates = *ns_addr, nacc, hashval, transsym, nfaccnum;
 	int stkend, nstate;
 	static int did_stk_init = false, *stk; 
@@ -681,7 +681,7 @@ void ntod()
 
 		if ( caseins && ! useecs )
 			{
-			register int j;
+			int j;
 
 			for ( i = 'A', j = 'a'; i <= 'Z'; ++i, ++j )
 				{
@@ -796,7 +796,7 @@ int snstods( sns, numstates, accset, nacc, hashval, newds_addr )
 int sns[], numstates, accset[], nacc, hashval, *newds_addr;
 	{
 	int didsort = 0;
-	register int i, j;
+	int i, j;
 	int newds, *oldsns;
 
 	for ( i = 1; i <= lastdfa; ++i )
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
index 67d5179fc99..232f518863d 100644
--- a/usr.bin/lex/ecs.c
+++ b/usr.bin/lex/ecs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ecs.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
+/*	$OpenBSD: ecs.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* ecs - equivalence class routines */
 
@@ -28,7 +28,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/ecs.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/ecs.c,v 1.5 2001/11/19 19:02:14 mpech Exp $ */
 
 #include "flexdef.h"
 
@@ -144,7 +144,7 @@ int lenccl, fwd[], bck[], llsiz, NUL_mapping;
 			{ /* look for the symbol in the character class */
 			for ( ; j < lenccl; ++j )
 				{
-				register int ccl_char;
+				int ccl_char;
 
 				if ( NUL_mapping && ccls[j] == 0 )
 					ccl_char = NUL_mapping;
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
index 298143c7542..7e224852bc2 100644
--- a/usr.bin/lex/gen.c
+++ b/usr.bin/lex/gen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gen.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $	*/
+/*	$OpenBSD: gen.c,v 1.6 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* gen - actual generation (writing) of flex scanners */
 
@@ -28,7 +28,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/gen.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/gen.c,v 1.6 2001/11/19 19:02:14 mpech Exp $ */
 
 #include "flexdef.h"
 
@@ -63,7 +63,7 @@ static char C_state_decl[] =
 
 void do_indent()
 	{
-	register int i = indent_level * 8;
+	int i = indent_level * 8;
 
 	while ( i >= 8 )
 		{
@@ -133,7 +133,7 @@ void gen_bu_action()
 
 void genctbl()
 	{
-	register int i;
+	int i;
 	int end_of_buffer_action = num_rules + 1;
 
 	/* Table of verify for transition and offset to next state. */
@@ -229,7 +229,7 @@ void genctbl()
 
 void genecs()
 	{
-	register int i, j;
+	int i, j;
 	int numrows;
 
 	out_str_dec( C_int_decl, "yy_ec", csize );
@@ -410,7 +410,7 @@ void gen_find_action()
 
 void genftbl()
 	{
-	register int i;
+	int i;
 	int end_of_buffer_action = num_rules + 1;
 
 	out_str_dec( long_align ? C_long_decl : C_short_decl,
@@ -420,7 +420,7 @@ void genftbl()
 
 	for ( i = 1; i <= lastdfa; ++i )
 		{
-		register int anum = dfaacc[i].dfaacc_state;
+		int anum = dfaacc[i].dfaacc_state;
 
 		mkdata( anum );
 
@@ -957,7 +957,7 @@ void gentabs()
 
 	for ( i = 1; i <= lastdfa; ++i )
 		{
-		register int d = def[i];
+		int d = def[i];
 
 		if ( base[i] == JAMSTATE )
 			base[i] = jambase;
@@ -1059,7 +1059,7 @@ char str[];
 
 void make_tables()
 	{
-	register int i;
+	int i;
 	int did_eof_rule = false;
 
 	skelout();
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index 7f63cc19346..8b0bbceeb4c 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: initscan.c,v 1.5 1997/07/25 21:05:29 mickey Exp $	*/
+/*	$OpenBSD: initscan.c,v 1.6 2001/11/19 19:02:14 mpech Exp $	*/
 
 #line 2 "scan.c"
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.5 1997/07/25 21:05:29 mickey Exp $
+ * $Header: /home/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.6 2001/11/19 19:02:14 mpech Exp $
  */
 
 #define FLEX_SCANNER
@@ -1272,7 +1272,7 @@ char *yytext;
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.5 1997/07/25 21:05:29 mickey Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.6 2001/11/19 19:02:14 mpech Exp $ */
 
 #include "flexdef.h"
 #include "parse.h"
@@ -1481,9 +1481,9 @@ YY_MALLOC_DECL
 
 YY_DECL
 	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
 
 #line 94 "scan.l"
 
@@ -1539,7 +1539,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
 				yy_last_accepting_state = yy_current_state;
@@ -2292,7 +2292,7 @@ case 106:
 YY_RULE_SETUP
 #line 435 "scan.l"
 {
-			register Char *nmdefptr;
+			Char *nmdefptr;
 			Char *ndlookup();
 
 			strcpy( nmstr, yytext + 1 );
@@ -2891,9 +2891,9 @@ case YY_STATE_EOF(LINEDIR):
 
 static int yy_get_next_buffer()
 	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
+	char *dest = yy_current_buffer->yy_ch_buf;
+	char *source = yytext_ptr;
+	int number_to_move, i;
 	int ret_val;
 
 	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -3023,15 +3023,15 @@ static int yy_get_next_buffer()
 
 static yy_state_type yy_get_previous_state()
 	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
 
 	yy_current_state = yy_start;
 	yy_current_state += YY_AT_BOL();
 
 	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			yy_last_accepting_state = yy_current_state;
@@ -3063,10 +3063,10 @@ static yy_state_type yy_try_NUL_trans( yy_current_state )
 yy_state_type yy_current_state;
 #endif
 	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
+	int yy_is_jam;
+	char *yy_cp = yy_c_buf_p;
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		yy_last_accepting_state = yy_current_state;
@@ -3087,14 +3087,14 @@ yy_state_type yy_current_state;
 
 #ifndef YY_NO_UNPUT
 #ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
+static void yyunput( int c, char *yy_bp )
 #else
 static void yyunput( c, yy_bp )
 int c;
-register char *yy_bp;
+char *yy_bp;
 #endif
 	{
-	register char *yy_cp = yy_c_buf_p;
+	char *yy_cp = yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
 	*yy_cp = yy_hold_char;
@@ -3102,10 +3102,10 @@ register char *yy_bp;
 	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
+		int number_to_move = yy_n_chars + 2;
+		char *dest = &yy_current_buffer->yy_ch_buf[
 					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
+		char *source =
 				&yy_current_buffer->yy_ch_buf[number_to_move];
 
 		while ( source > yy_current_buffer->yy_ch_buf )
@@ -3567,7 +3567,7 @@ yyconst char *s2;
 int n;
 #endif
 	{
-	register int i;
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 	}
@@ -3581,7 +3581,7 @@ static int yy_flex_strlen( s )
 yyconst char *s;
 #endif
 	{
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index ff5fdad7383..83825821d9a 100644
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $	*/
+/*	$OpenBSD: misc.c,v 1.6 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* misc - miscellaneous flex routines */
 
@@ -28,7 +28,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/misc.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/misc.c,v 1.6 2001/11/19 19:02:14 mpech Exp $ */
 
 #include "flexdef.h"
 
@@ -84,7 +84,7 @@ void *allocate_array( size, element_size )
 int size;
 size_t element_size;
 	{
-	register void *mem;
+	void *mem;
 	size_t num_bytes = element_size * size;
 
 	mem = flex_alloc( num_bytes );
@@ -99,7 +99,7 @@ size_t element_size;
 /* all_lower - true if a string is all lower-case */
 
 int all_lower( str )
-register char *str;
+char *str;
 	{
 	while ( *str )
 		{
@@ -115,7 +115,7 @@ register char *str;
 /* all_upper - true if a string is all upper-case */
 
 int all_upper( str )
-register char *str;
+char *str;
 	{
 	while ( *str )
 		{
@@ -146,7 +146,7 @@ register char *str;
 void bubble( v, n )
 int v[], n;
 	{
-	register int i, j, k;
+	int i, j, k;
 
 	for ( i = n; i > 1; --i )
 		for ( j = 1; j < i; ++j )
@@ -182,7 +182,7 @@ int c;
 /* clower - replace upper-case letter to lower-case */
 
 Char clower( c )
-register int c;
+int c;
 	{
 	return (Char) ((isascii( c ) && isupper( c )) ? tolower( c ) : c);
 	}
@@ -191,10 +191,10 @@ register int c;
 /* copy_string - returns a dynamically allocated copy of a string */
 
 char *copy_string( str )
-register const char *str;
+const char *str;
 	{
-	register const char *c1;
-	register char *c2;
+	const char *c1;
+	char *c2;
 	char *copy;
 	unsigned int size;
 
@@ -220,9 +220,9 @@ register const char *str;
  */
 
 Char *copy_unsigned_string( str )
-register Char *str;
+Char *str;
 	{
-	register Char *c;
+	Char *c;
 	Char *copy;
 
 	/* find length */
@@ -655,7 +655,7 @@ unsigned int x;
 void out_line_count( str )
 const char str[];
 	{
-	register int i;
+	int i;
 
 	for ( i = 0; str[i]; ++i )
 		if ( str[i] == '\n' )
@@ -713,7 +713,7 @@ const char str[];
  */
 
 char *readable_form( c )
-register int c;
+int c;
 	{
 	static char rform[10];
 
@@ -759,7 +759,7 @@ void *array;
 int size;
 size_t element_size;
 	{
-	register void *new_array;
+	void *new_array;
 	size_t num_bytes = element_size * size;
 
 	new_array = flex_realloc( array, num_bytes );
@@ -878,7 +878,7 @@ void zero_out( region_ptr, size_in_bytes )
 char *region_ptr;
 size_t size_in_bytes;
 	{
-	register char *rp, *rp_end;
+	char *rp, *rp_end;
 
 	rp = region_ptr;
 	rp_end = region_ptr + size_in_bytes;
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
index 46741789c69..47279a7e978 100644
--- a/usr.bin/lex/nfa.c
+++ b/usr.bin/lex/nfa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
+/*	$OpenBSD: nfa.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* nfa - NFA construction routines */
 
@@ -28,7 +28,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/nfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/nfa.c,v 1.5 2001/11/19 19:02:14 mpech Exp $ */
 
 #include "flexdef.h"
 
@@ -321,7 +321,7 @@ int first, last;
  */
 
 void mark_beginning_as_normal( mach )
-register int mach;
+int mach;
 	{
 	switch ( state_type[mach] )
 		{
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
index 9568dc44a4f..1ed0c405097 100644
--- a/usr.bin/lex/sym.c
+++ b/usr.bin/lex/sym.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sym.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
+/*	$OpenBSD: sym.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* sym - symbol table routines */
 
@@ -28,14 +28,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/sym.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/sym.c,v 1.5 2001/11/19 19:02:14 mpech Exp $ */
 
 #include "flexdef.h"
 
 
 /* declare functions that have forward references */
 
-int hashfunct PROTO((register char[], int));
+int hashfunct PROTO((char[], int));
 
 
 struct hash_entry *ndtbl[NAME_TABLE_HASH_SIZE];
@@ -51,16 +51,16 @@ struct hash_entry *findsym();
  */
 
 int addsym( sym, str_def, int_def, table, table_size )
-register char sym[];
+char sym[];
 char *str_def;
 int int_def;
 hash_table table;
 int table_size;
 	{
 	int hash_val = hashfunct( sym, table_size );
-	register struct hash_entry *sym_entry = table[hash_val];
-	register struct hash_entry *new_entry;
-	register struct hash_entry *successor;
+	struct hash_entry *sym_entry = table[hash_val];
+	struct hash_entry *new_entry;
+	struct hash_entry *successor;
 
 	while ( sym_entry )
 		{
@@ -130,7 +130,7 @@ Char ccltxt[];
 /* findsym - find symbol in symbol table */
 
 struct hash_entry *findsym( sym, table, table_size )
-register char sym[];
+char sym[];
 hash_table table;
 int table_size;
 	{
@@ -139,7 +139,7 @@ int table_size;
 		(struct hash_entry *) 0, (struct hash_entry *) 0,
 		(char *) 0, (char *) 0, 0,
 		} ;
-	register struct hash_entry *sym_entry =
+	struct hash_entry *sym_entry =
 		table[hashfunct( sym, table_size )];
 
 	while ( sym_entry )
@@ -156,11 +156,11 @@ int table_size;
 /* hashfunct - compute the hash value for "str" and hash size "hash_size" */
 
 int hashfunct( str, hash_size )
-register char str[];
+char str[];
 int hash_size;
 	{
-	register int hashval;
-	register int locstr;
+	int hashval;
+	int locstr;
 
 	hashval = 0;
 	locstr = 0;
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
index 6bae5860561..1c194b56d46 100644
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tblcmp.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
+/*	$OpenBSD: tblcmp.c,v 1.5 2001/11/19 19:02:14 mpech Exp $	*/
 
 /* tblcmp - table compression routines */
 
@@ -28,14 +28,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/tblcmp.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/tblcmp.c,v 1.5 2001/11/19 19:02:14 mpech Exp $ */
 
 #include "flexdef.h"
 
 
 /* declarations for functions that have forward references */
 
-void mkentry PROTO((register int*, int, int, int, int));
+void mkentry PROTO((int*, int, int, int, int));
 void mkprot PROTO((int[], int, int));
 void mktemplate PROTO((int[], int, int));
 void mv2front PROTO((int));
@@ -230,7 +230,7 @@ int state[], statenum, totaltrans, comstate, comfreq;
 void cmptmps()
 	{
 	int tmpstorage[CSIZE + 1];
-	register int *tmp = tmpstorage, i, j;
+	int *tmp = tmpstorage, i, j;
 	int totaltrans, trans;
 
 	peakpairs = numtemps * numecs + tblend;
@@ -302,7 +302,7 @@ void cmptmps()
 
 void expand_nxt_chk()
 	{
-	register int old_max = current_max_xpairs;
+	int old_max = current_max_xpairs;
 
 	current_max_xpairs += MAX_XPAIRS_INCREMENT;
 
@@ -341,9 +341,9 @@ int *state, numtrans;
 	/* Firstfree is the position of the first possible occurrence of two
 	 * consecutive unused records in the chk and nxt arrays.
 	 */
-	register int i;
-	register int *state_ptr, *chk_ptr;
-	register int *ptr_to_last_entry_in_state;
+	int i;
+	int *state_ptr, *chk_ptr;
+	int *ptr_to_last_entry_in_state;
 
 	/* If there are too many out-transitions, put the state at the end of
 	 * nxt and chk.
@@ -436,7 +436,7 @@ int *state, numtrans;
  */
 void inittbl()
 	{
-	register int i;
+	int i;
 
 	zero_out( (char *) chk, (size_t) (current_max_xpairs * sizeof( int )) );
 
@@ -517,10 +517,10 @@ void mkdeftbl()
  */
 
 void mkentry( state, numchars, statenum, deflink, totaltrans )
-register int *state;
+int *state;
 int numchars, statenum, deflink, totaltrans;
 	{
-	register int minec, maxec, i, baseaddr;
+	int minec, maxec, i, baseaddr;
 	int tblbase, tbllast;
 
 	if ( totaltrans == 0 )
@@ -794,8 +794,8 @@ int qelm;
 void place_state( state, statenum, transnum )
 int *state, statenum, transnum;
 	{
-	register int i;
-	register int *state_ptr;
+	int i;
+	int *state_ptr;
 	int position = find_table_space( state, transnum );
 
 	/* "base" is the table of start positions. */
@@ -869,8 +869,8 @@ int statenum, sym, nextstate, deflink;
 int tbldiff( state, pr, ext )
 int state[], pr, ext[];
 	{
-	register int i, *sp = state, *ep = ext, *protp;
-	register int numdiff = 0;
+	int i, *sp = state, *ep = ext, *protp;
+	int numdiff = 0;
 
 	protp = &protsave[numecs * (pr - 1)];
 
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 92b0a6ccafb..f51e86d78b1 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -1,5 +1,5 @@
 /*
- *	$OpenBSD: locate.bigram.c,v 1.6 1996/10/20 00:52:51 michaels Exp $
+ *	$OpenBSD: locate.bigram.c,v 1.7 2001/11/19 19:02:14 mpech Exp $
  *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id: locate.bigram.c,v 1.6 1996/10/20 00:52:51 michaels Exp $
+ * 	$Id: locate.bigram.c,v 1.7 2001/11/19 19:02:14 mpech Exp $
  */
 
 #ifndef lint
@@ -45,7 +45,7 @@ static char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #else
-static char rcsid[] = "$OpenBSD: locate.bigram.c,v 1.6 1996/10/20 00:52:51 michaels Exp $";
+static char rcsid[] = "$OpenBSD: locate.bigram.c,v 1.7 2001/11/19 19:02:14 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,9 +72,9 @@ u_int bigram[UCHAR_MAX + 1][UCHAR_MAX + 1];
 int
 main(void)
 {
-  	register u_char *cp;
-	register u_char *oldpath = buf1, *path = buf2;
-	register u_int i, j;
+  	u_char *cp;
+	u_char *oldpath = buf1, *path = buf2;
+	u_int i, j;
 
      	while (fgets(path, sizeof(buf2), stdin) != NULL) {
 
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 2df97a0ed20..26056bd23a7 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,5 +1,5 @@
 /*
- *	$OpenBSD: locate.code.c,v 1.7 1997/01/15 23:42:42 millert Exp $
+ *	$OpenBSD: locate.code.c,v 1.8 2001/11/19 19:02:15 mpech Exp $
  *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id: locate.code.c,v 1.7 1997/01/15 23:42:42 millert Exp $
+ * 	$Id: locate.code.c,v 1.8 2001/11/19 19:02:15 mpech Exp $
  */
 
 #ifndef lint
@@ -48,7 +48,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)locate.code.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: locate.code.c,v 1.7 1997/01/15 23:42:42 millert Exp $";
+static char rcsid[] = "$OpenBSD: locate.code.c,v 1.8 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -132,10 +132,10 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register u_char *cp, *oldpath, *path;
+	u_char *cp, *oldpath, *path;
 	int ch, code, count, diffcount, oldcount;
 	FILE *fp;
-	register int i, j;
+	int i, j;
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {
@@ -258,7 +258,7 @@ int
 bgindex(bg)			/* Return location of bg in bigrams or -1. */
 	char *bg;
 {
-	register char bg0, bg1, *p;
+	char bg0, bg1, *p;
 
 	bg0 = bg[0];
 	bg1 = bg[1];
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index 803fb468f85..408ceb3ebd6 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fastfind.c,v 1.5 1998/07/24 20:50:24 deraadt Exp $	*/
+/*	$OpenBSD: fastfind.c,v 1.6 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: fastfind.c,v 1.5 1998/07/24 20:50:24 deraadt Exp $
+ * $Id: fastfind.c,v 1.6 2001/11/19 19:02:15 mpech Exp $
  */
 
 #ifndef _LOCATE_STATISTIC_
@@ -47,9 +47,9 @@ statistic (fp, path_fcodes)
 	FILE *fp;               /* open database */
 	char *path_fcodes;  	/* for error message */
 {
-	register int lines, chars, size, big, zwerg;
-	register u_char *p, *s;
-	register int c;
+	int lines, chars, size, big, zwerg;
+	u_char *p, *s;
+	int c;
 	int count, umlaut;
 	u_char bigram1[NBG], bigram2[NBG], path[MAXPATHLEN];
 
@@ -139,8 +139,8 @@ fastfind
 #endif /* MMAP */
 
 {
-	register u_char *p, *s, *patend, *q, *foundchar;
-	register int c, cc;
+	u_char *p, *s, *patend, *q, *foundchar;
+	int c, cc;
 	int count, found, globflag;
 	u_char *cutoff;
 	u_char bigram1[NBG], bigram2[NBG], path[MAXPATHLEN];
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 4ee6c75e678..c23a17fc04a 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,5 +1,5 @@
 /*
- *	$OpenBSD: locate.c,v 1.9 2001/05/11 15:56:14 art Exp $
+ *	$OpenBSD: locate.c,v 1.10 2001/11/19 19:02:15 mpech Exp $
  *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: locate.c,v 1.9 2001/05/11 15:56:14 art Exp $
+ *      $Id: locate.c,v 1.10 2001/11/19 19:02:15 mpech Exp $
  */
 
 #ifndef lint
@@ -50,7 +50,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: locate.c,v 1.9 2001/05/11 15:56:14 art Exp $";
+static char rcsid[] = "$OpenBSD: locate.c,v 1.10 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -153,7 +153,7 @@ main(argc, argv)
         int argc;
         char **argv;
 {
-        register int ch;
+        int ch;
         char **dbv = NULL;
 #ifdef MMAP
         f_mmap = 1;		/* mmap is default */
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 95ff600c75f..cc0d7fed25f 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.3 1997/01/17 07:12:42 millert Exp $
+/*	$OpenBSD: util.c,v 1.4 2001/11/19 19:02:15 mpech Exp $
  *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: util.c,v 1.3 1997/01/17 07:12:42 millert Exp $
+ * $Id: util.c,v 1.4 2001/11/19 19:02:15 mpech Exp $
  */
 
 
@@ -154,7 +154,7 @@ char *
 patprep(name)
 	char *name;
 {
-	register char *endmark, *p, *subp;
+	char *endmark, *p, *subp;
 
 	subp = globfree;
 	*subp++ = '\0';   /* set first element to '\0' */
@@ -208,7 +208,7 @@ u_char *
 tolower_word(word)
 	u_char *word;
 {
-	register u_char *p;
+	u_char *p;
 
 	for(p = word; *p != '\0'; p++)
 		*p = TOLOWER(*p);
@@ -232,7 +232,7 @@ getwm(p)
 	caddr_t p;
 {
 	static char buf[INTSIZE];
-	register int i;
+	int i;
 
 	for (i = 0; i < INTSIZE; i++)
 		buf[i] = *p++;
@@ -263,7 +263,7 @@ int
 getwf(fp)
 	FILE *fp;
 {
-	register int word;
+	int word;
 
 	word = getw(fp);
 
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index 6b2b30662f5..3bf67f0b0d4 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logger.c,v 1.3 1997/01/15 23:42:45 millert Exp $	*/
+/*	$OpenBSD: logger.c,v 1.4 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: logger.c,v 1.4 1994/12/22 06:27:00 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)logger.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: logger.c,v 1.3 1997/01/15 23:42:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: logger.c,v 1.4 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <errno.h>
@@ -112,7 +112,7 @@ main(argc, argv)
 
 	/* log input line if appropriate */
 	if (argc > 0) {
-		register char *p, *endp;
+		char *p, *endp;
 		int len;
 
 		for (p = buf, endp = buf + sizeof(buf) - 2; *argv;) {
@@ -143,7 +143,7 @@ main(argc, argv)
  */
 int
 pencode(s)
-	register char *s;
+	char *s;
 {
 	char *save;
 	int fac, lev;
@@ -177,7 +177,7 @@ decode(name, codetab)
 	char *name;
 	CODE *codetab;
 {
-	register CODE *c;
+	CODE *c;
 
 	if (isdigit(*name))
 		return (atoi(name));
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 750a8c5421a..7d223deb2e1 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: look.c,v 1.5 2000/10/12 10:01:18 art Exp $	*/
+/*	$OpenBSD: look.c,v 1.6 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: look.c,v 1.7 1995/08/31 22:41:02 jtc Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)look.c	8.2 (Berkeley) 5/4/95";
 #endif
-static char rcsid[] = "$OpenBSD: look.c,v 1.5 2000/10/12 10:01:18 art Exp $";
+static char rcsid[] = "$OpenBSD: look.c,v 1.6 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -158,8 +158,8 @@ int
 look(string, front, back)
 	char *string, *front, *back;
 {
-	register int ch;
-	register char *readp, *writep;
+	int ch;
+	char *readp, *writep;
 
 	/* Reformat string string to avoid doing it multiple times later. */
 	for (readp = writep = string; ch = *readp++;) {
@@ -224,9 +224,9 @@ look(string, front, back)
 
 char *
 binary_search(string, front, back)
-	register char *string, *front, *back;
+	char *string, *front, *back;
 {
-	register char *p;
+	char *p;
 
 	p = front + (back - front) / 2;
 	SKIP_PAST_NEWLINE(p, back);
@@ -282,7 +282,7 @@ linear_search(string, front, back)
  */
 void 
 print_from(string, front, back)
-	register char *string, *front, *back;
+	char *string, *front, *back;
 {
 	for (; front < back && compare(string, front, back) == EQUAL; ++front) {
 		for (; front < back && *front != '\n'; ++front)
@@ -308,9 +308,9 @@ print_from(string, front, back)
  */
 int
 compare(s1, s2, back)
-	register char *s1, *s2, *back;
+	char *s1, *s2, *back;
 {
-	register int ch;
+	int ch;
 
 	for (; *s1 && s2 < back && *s2 != '\n'; ++s1, ++s2) {
 		ch = *s2;
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index f23f5908b5b..034bd7b34c9 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkstr.c,v 1.3 1997/07/05 23:11:12 deraadt Exp $	*/
+/*	$OpenBSD: mkstr.c,v 1.4 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: mkstr.c,v 1.3 1997/07/05 23:11:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkstr.c,v 1.4 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -134,7 +134,7 @@ main(argc, argv)
 void
 process()
 {
-	register c;
+	int c;
 
 	for (;;) {
 		c = getchar();
@@ -159,8 +159,8 @@ int
 match(ocp)
 	char *ocp;
 {
-	register char *cp;
-	register c;
+	char *cp;
+	int c;
 
 	for (cp = ocp + 1; *cp; cp++) {
 		c = getchar();
@@ -177,9 +177,9 @@ match(ocp)
 void
 copystr()
 {
-	register c, ch;
+	int c, ch;
 	char buf[512];
-	register char *cp = buf;
+	char *cp = buf;
 
 	for (;;) {
 		c = getchar();
@@ -274,10 +274,10 @@ hashit(str, really, fakept)
 	unsigned fakept;
 {
 	int i;
-	register struct hash *hp;
+	struct hash *hp;
 	char buf[512];
 	long hashval = 0;
-	register char *cp;
+	char *cp;
 
 	if (really)
 		fflush(mesgwrite);
@@ -317,11 +317,11 @@ hashit(str, really, fakept)
 int
 fgetNUL(obuf, rmdr, file)
 	char *obuf;
-	register int rmdr;
+	int rmdr;
 	FILE *file;
 {
-	register c;
-	register char *buf = obuf;
+	int c;
+	char *buf = obuf;
 
 	while (--rmdr > 0 && (c = getc(file)) != 0 && c != EOF)
 		*buf++ = c;
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index bde3fbb9761..0c759eacd8a 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msgs.c,v 1.18 2001/09/04 23:35:59 millert Exp $	*/
+/*	$OpenBSD: msgs.c,v 1.19 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: msgs.c,v 1.7 1995/09/28 06:57:40 tls Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: msgs.c,v 1.18 2001/09/04 23:35:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: msgs.c,v 1.19 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -295,7 +295,7 @@ main(argc, argv)
 		lastmsg = 0;
 
 		for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)){
-			register int i = 0;
+			int i = 0;
 
 			cp = dp->d_name;
 			if (dp->d_ino == 0)
diff --git a/usr.bin/nc/data/data.c b/usr.bin/nc/data/data.c
index 206945eed2e..e1936d538cb 100644
--- a/usr.bin/nc/data/data.c
+++ b/usr.bin/nc/data/data.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: data.c,v 1.3 2001/01/29 01:58:11 niklas Exp $	*/
+/*	$OpenBSD: data.c,v 1.4 2001/11/19 19:02:15 mpech Exp $	*/
 
 /* primitive arbitrary-data frontend for netcat.  0.9 960226
    only handles one value per ascii line, but at least parses 0xNN too
@@ -38,8 +38,8 @@ char * fgetss (buf, len, from)
   size_t len;
   FILE * from;
 {
-  register int x;
-  register char * p, * q;
+  int x;
+  char * p, * q;
   p = fgets (buf, len, from);		/* returns ptr to buf */
   if (! p)
     return (NULL);
@@ -61,8 +61,8 @@ char * fgetss (buf, len, from)
    swiped from rndb.c.  Generates an INT, you have to mask down to char. */
 int randint()
 {
-  register int q;
-  register int x;
+  int q;
+  int x;
 
 #ifndef HAVE_RANDOM
   q = rand();
@@ -78,12 +78,12 @@ main (argc, argv)
   int argc;
   char ** argv;
 {
-  register unsigned char * p;
-  register char * q;
-  register int x;
+  unsigned char * p;
+  char * q;
+  int x;
   int bc = 0;
   int limit = 0;		/* num to gen, or 0 = infinite */
-  register int xlimit;		/* running limit */
+  int xlimit;			/* running limit */
   FILE * txt;			/* line-by-line ascii file */
   int raw;			/* raw bytes fd */
   int dumping = 0;		/* cmd flags ... */
diff --git a/usr.bin/nc/data/rservice.c b/usr.bin/nc/data/rservice.c
index d6794df9411..83c935537b6 100644
--- a/usr.bin/nc/data/rservice.c
+++ b/usr.bin/nc/data/rservice.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rservice.c,v 1.2 2001/01/29 01:58:12 niklas Exp $	*/
+/*	$OpenBSD: rservice.c,v 1.3 2001/11/19 19:02:15 mpech Exp $	*/
 
 /* generate ^@string1^@string2^@cmd^@ input to netcat, for scripting up
    rsh/rexec attacks.  Needs to be a prog because shells strip out nulls.
@@ -22,8 +22,8 @@ main(argc, argv)
   int argc;
   char * argv[];
 {
-  register int x;
-  register int y;
+  int x;
+  int y;
   char * p;
   char * q;
 
diff --git a/usr.bin/nc/data/xor.c b/usr.bin/nc/data/xor.c
index 515e225a1ec..2fed2911737 100644
--- a/usr.bin/nc/data/xor.c
+++ b/usr.bin/nc/data/xor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xor.c,v 1.2 2001/01/29 01:58:12 niklas Exp $	*/
+/*	$OpenBSD: xor.c,v 1.3 2001/11/19 19:02:15 mpech Exp $	*/
 
 /* Generic xor handler.
 
@@ -27,8 +27,8 @@ xorb (buf, len)
   char * buf;
   int len;
 {
-  register int x;
-  register char * pb;
+  int x;
+  char * pb;
 
   pb = buf;
   x = len;
@@ -47,8 +47,8 @@ main (argc, argv)
   int argc;
   char ** argv;
 {
-  register int x = 0;
-  register int y;
+  int x = 0;
+  int y;
 
 /* manually preload; xor-with-0xFF is all too common */
   memset (bytes, 0, sizeof (bytes));
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 7d452277bea..5da07b16231 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atalk.c,v 1.4 2001/08/18 22:14:03 brian Exp $	*/
+/*	$OpenBSD: atalk.c,v 1.5 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: atalk.c,v 1.2 1997/05/22 17:21:26 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from @(#)atalk.c	1.1 (Whistle) 6/6/96";
 #else
-static char rcsid[] = "$OpenBSD: atalk.c,v 1.4 2001/08/18 22:14:03 brian Exp $";
+static char rcsid[] = "$OpenBSD: atalk.c,v 1.5 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -264,7 +264,7 @@ atalkprotopr(off, name)
 	char  *name;
 {
 	struct ddpcb    cb;
-	register struct ddpcb *prev, *next;
+	struct ddpcb *prev, *next;
 	struct ddpcb   *initial;
 
 	if (off == 0)
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 9eec41f3981..6a16269fba8 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.26 2001/09/04 23:35:59 millert Exp $	*/
+/*	$OpenBSD: if.c,v 1.27 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)if.c	8.2 (Berkeley) 2/21/94";
 #else
-static char *rcsid = "$OpenBSD: if.c,v 1.26 2001/09/04 23:35:59 millert Exp $";
+static char *rcsid = "$OpenBSD: if.c,v 1.27 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -137,7 +137,7 @@ intpr(interval, ifnetaddr)
 #ifdef INET6
 		struct sockaddr_in6 *sin6;
 #endif
-		register char *cp;
+		char *cp;
 		int n, m;
 
 		if (ifaddraddr == 0) {
@@ -391,8 +391,8 @@ sidewaysintpr(interval, off)
 {
 	struct ifnet ifnet;
 	u_long firstifnet;
-	register struct iftot *ip, *total;
-	register int line;
+	struct iftot *ip, *total;
+	int line;
 	struct iftot *lastif, *sum, *interesting;
 	struct ifnet_head ifhead;	/* TAILQ_HEAD */
 	sigset_t emptyset;
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 4ee5e5b14ed..791b03522c6 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.53 2001/08/26 09:42:04 brian Exp $	*/
+/*	$OpenBSD: inet.c,v 1.54 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-static char *rcsid = "$OpenBSD: inet.c,v 1.53 2001/08/26 09:42:04 brian Exp $";
+static char *rcsid = "$OpenBSD: inet.c,v 1.54 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -132,10 +132,10 @@ protopr0(off, name, af)
 	int af;
 {
 	struct inpcbtable table;
-	register struct inpcb *head, *next, *prev;
+	struct inpcb *head, *next, *prev;
 	struct inpcb inpcb;
 	int istcp;
-	static int first = 1;
+	int first = 1;
 	char *name0;
 	char namebuf[20];
 
@@ -453,7 +453,7 @@ icmp_stats(off, name)
 	char *name;
 {
 	struct icmpstat icmpstat;
-	register int i, first;
+	int i, first;
 
 	if (off == 0)
 		return;
@@ -537,11 +537,11 @@ getrpcportnam(port, proto)
 	int proto;
 {
 	struct sockaddr_in server_addr;
-	register struct hostent *hp;
+	struct hostent *hp;
 	static struct pmaplist *head;
 	int socket = RPC_ANYSOCK;
 	struct timeval minutetimeout;
-	register CLIENT *client;
+	CLIENT *client;
 	struct rpcent *rpc;
 	static int first;
 	static struct rpcnams *rpcn;
@@ -602,7 +602,7 @@ getrpcportnam(port, proto)
  */
 void
 inetprint(in, port, proto, local)
-	register struct in_addr *in;
+	struct in_addr *in;
 	in_port_t port;
 	char *proto;
 	int local;
@@ -638,7 +638,7 @@ char *
 inetname(inp)
 	struct in_addr *inp;
 {
-	register char *cp;
+	char *cp;
 	static char line[50];
 	struct hostent *hp;
 	struct netent *np;
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index a7146d000b3..288b8fcd062 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet6.c,v 1.15 2001/06/13 02:29:15 itojun Exp $	*/
+/*	$OpenBSD: inet6.c,v 1.16 2001/11/19 19:02:15 mpech Exp $	*/
 /*	BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp	*/
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-/*__RCSID("$OpenBSD: inet6.c,v 1.15 2001/06/13 02:29:15 itojun Exp $");*/
+/*__RCSID("$OpenBSD: inet6.c,v 1.16 2001/11/19 19:02:15 mpech Exp $");*/
 /*__RCSID("KAME Id: inet6.c,v 1.10 2000/02/09 10:49:31 itojun Exp");*/
 #endif
 #endif /* not lint */
@@ -831,7 +831,7 @@ icmp6_stats(off, name)
 	char *name;
 {
 	struct icmp6stat icmp6stat;
-	register int i, first;
+	int i, first;
 
 	if (off == 0)
 		return;
@@ -999,7 +999,7 @@ pim6_stats(off, name)
 
 void
 inet6print(in6, port, proto)
-	register struct in6_addr *in6;
+	struct in6_addr *in6;
 	int port;
 	char *proto;
 {
@@ -1043,7 +1043,7 @@ char *
 inet6name(in6p)
 	struct in6_addr *in6p;
 {
-	register char *cp;
+	char *cp;
 	static char line[NI_MAXHOST];
 	struct hostent *hp;
 	static char domain[MAXHOSTNAMELEN + 1];
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 91e4ca5dad9..917f8bcb1e0 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx.c,v 1.7 2000/10/23 19:17:09 mickey Exp $	*/
+/*	$OpenBSD: ipx.c,v 1.8 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)ns.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: ipx.c,v 1.7 2000/10/23 19:17:09 mickey Exp $";
+static char *rcsid = "$OpenBSD: ipx.c,v 1.8 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -95,7 +95,7 @@ ipxprotopr(off, name)
 	char *name;
 {
 	struct ipxpcbtable	table;
-	register struct ipxpcb	*head, *prev, *next;
+	struct ipxpcb	*head, *prev, *next;
 	int isspx;
 
 	if (off == 0)
@@ -284,8 +284,8 @@ ipxerr_stats(off, name)
 	char *name;
 {
 	struct ipx_errstat ipx_errstat;
-	register int j;
-	register int histoprint = 1;
+	int j;
+	int histoprint = 1;
 	int z;
 
 	if (off == 0)
diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c
index e1079c72e9d..55dc7880581 100644
--- a/usr.bin/netstat/iso.c
+++ b/usr.bin/netstat/iso.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso.c,v 1.7 1998/02/27 12:07:36 deraadt Exp $	*/
+/*	$OpenBSD: iso.c,v 1.8 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: iso.c,v 1.12 1995/10/03 21:42:38 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)iso.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: iso.c,v 1.7 1998/02/27 12:07:36 deraadt Exp $";
+static char *rcsid = "$OpenBSD: iso.c,v 1.8 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -225,7 +225,7 @@ iso_protopr(off, name)
 	char *name;
 {
 	struct isopcb cb;
-	register struct isopcb *prev, *next;
+	struct isopcb *prev, *next;
 
 	if (off == 0) {
 		printf("%s control block: symbol not in namelist\n", name);
@@ -381,7 +381,7 @@ tp_inproto(pcb)
 #ifdef notdef
 char *
 isonetname(iso)
-	register struct iso_addr *iso;
+	struct iso_addr *iso;
 {
 	struct sockaddr_iso sa;
 	struct iso_hostent *ihe = 0;
@@ -413,7 +413,7 @@ isonetname(iso)
 
 static void
 isonetprint(iso, sufx, sufxlen, islocal)
-	register struct iso_addr *iso;
+	struct iso_addr *iso;
 	char *sufx;
 	u_short	sufxlen;
 	int islocal;
@@ -483,7 +483,7 @@ x25_protopr(off, name)
 		"ACKWAIT",
 		"OPEN",
 	};
-	register struct isopcb *prev, *next;
+	struct isopcb *prev, *next;
 	struct x25_pcb xpcb;
 
 	if (off == 0) {
@@ -561,7 +561,7 @@ tp_stats(off, name)
 
 static void
 tprintstat(s, indent)
-	register struct tp_stat *s;
+	struct tp_stat *s;
 	int indent;
 {
 	fprintf(OUT,
@@ -641,7 +641,7 @@ tprintstat(s, indent)
 	fprintf(OUT,
 		"\t%*sM:L ( M mbuf chains of length L)\n", indent, " ");
 	{
-		register int j;
+		int j;
 
 		fprintf(OUT, "\t%*s%ld: over 16\n", indent, " ",
 		s->ts_mb_len_distr[0]);
@@ -682,7 +682,7 @@ tprintstat(s, indent)
 		"\t%*s%ld tp 0 connection%s\n",  indent, " ",
 		s->ts_tp0_conn ,plural(s->ts_tp0_conn));
     {
-		register int j;
+		int j;
 		static char *name[]= {
 			"~LOCAL, PDN",
 			"~LOCAL,~PDN",
@@ -813,7 +813,7 @@ tprintstat(s, indent)
 
 static void
 isonetprint(siso, islocal)
-	register struct sockaddr_iso *siso;
+	struct sockaddr_iso *siso;
 	int islocal;
 {
 	hexprint(siso->siso_nlen, siso->siso_addr.isoa_genaddr, "{}");
@@ -833,9 +833,9 @@ hexprint(n, buf, delim)
 	int n;
 	char *buf, *delim;
 {
-	register u_char *in = (u_char *)buf, *top = in + n;
-	register char *out = obuf;
-	register int i;
+	u_char *in = (u_char *)buf, *top = in + n;
+	char *out = obuf;
+	int i;
 
 	if (n == 0)
 		return;
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 96b90b7ed89..d7d5d1f7aeb 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.27 2001/08/26 09:42:04 brian Exp $	*/
+/*	$OpenBSD: main.c,v 1.28 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)main.c	8.4 (Berkeley) 3/1/94";
 #else
-static char *rcsid = "$OpenBSD: main.c,v 1.27 2001/08/26 09:42:04 brian Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.28 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -289,8 +289,8 @@ main(argc, argv)
 {
 	extern char *optarg;
 	extern int optind;
-	register struct protoent *p;
-	register struct protox *tp = NULL; /* for printing cblocks & stats */
+	struct protoent *p;
+	struct protox *tp = NULL; /* for printing cblocks & stats */
 	int ch;
 	char *nlistf = NULL, *memf = NULL;
 	char buf[_POSIX2_LINE_MAX];
@@ -542,7 +542,7 @@ main(argc, argv)
  */
 static void
 printproto(tp, name)
-	register struct protox *tp;
+	struct protox *tp;
 	char *name;
 {
 	void (*pr)();
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 38b3e4daf09..d0b1c992fbd 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbuf.c,v 1.8 2001/05/18 02:41:38 provos Exp $	*/
+/*	$OpenBSD: mbuf.c,v 1.9 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: mbuf.c,v 1.9 1996/05/07 02:55:03 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: mbuf.c,v 1.8 2001/05/18 02:41:38 provos Exp $";
+static char *rcsid = "$OpenBSD: mbuf.c,v 1.9 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -86,9 +86,9 @@ mbpr(mbaddr, mbpooladdr, mclpooladdr)
 	u_long mbaddr;
 	u_long mbpooladdr, mclpooladdr;
 {
-	register int totmem, totused, totmbufs, totpct;
-	register int i;
-	register struct mbtypes *mp;
+	int totmem, totused, totmbufs, totpct;
+	int i;
+	struct mbtypes *mp;
 
 	if (nmbtypes != 256) {
 		fprintf(stderr,
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 1f1775be966..50ee1dd8734 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mroute.c,v 1.6 1998/02/27 12:07:37 deraadt Exp $	*/
+/*	$OpenBSD: mroute.c,v 1.7 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: mroute.c,v 1.10 1996/05/11 13:51:27 mycroft Exp $	*/
 
 /*
@@ -94,8 +94,8 @@ mroutepr(mrpaddr, mfchashtbladdr, mfchashaddr, vifaddr)
 	u_long mfchash;
 	struct vif viftable[MAXVIFS];
 	struct mfc *mfcp, mfc;
-	register struct vif *v;
-	register vifi_t vifi;
+	struct vif *v;
+	vifi_t vifi;
 	int i;
 	int banner_printed;
 	int saved_nflag;
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index 50ce7c2bd23..37759964235 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mroute6.c,v 1.1 1999/12/08 12:30:17 itojun Exp $	*/
+/*	$OpenBSD: mroute6.c,v 1.2 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -99,11 +99,11 @@ mroute6pr(mrpaddr, mfcaddr, mifaddr)
 	struct mif6 mif6table[MAXMIFS];
 	struct mf6c mfc;
 	struct rtdetq rte, *rtep;
-	register struct mif6 *mifp;
-	register mifi_t mifi;
-	register int i;
-	register int banner_printed;
-	register int saved_nflag;
+	struct mif6 *mifp;
+	mifi_t mifi;
+	int i;
+	int banner_printed;
+	int saved_nflag;
 	mifi_t maxmif = 0;
 	int waitings;
 
diff --git a/usr.bin/netstat/ns.c b/usr.bin/netstat/ns.c
index 37cec756816..011d46d6d72 100644
--- a/usr.bin/netstat/ns.c
+++ b/usr.bin/netstat/ns.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns.c,v 1.5 1998/02/27 12:07:38 deraadt Exp $	*/
+/*	$OpenBSD: ns.c,v 1.6 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: ns.c,v 1.8 1995/10/03 21:42:46 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)ns.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: ns.c,v 1.5 1998/02/27 12:07:38 deraadt Exp $";
+static char *rcsid = "$OpenBSD: ns.c,v 1.6 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -94,7 +94,7 @@ nsprotopr(off, name)
 	char *name;
 {
 	struct nspcb cb;
-	register struct nspcb *prev, *next;
+	struct nspcb *prev, *next;
 	int isspp;
 
 	if (off == 0)
@@ -288,8 +288,8 @@ nserr_stats(off, name)
 	char *name;
 {
 	struct ns_errstat ns_errstat;
-	register int j;
-	register int histoprint = 1;
+	int j;
+	int histoprint = 1;
 	int z;
 
 	if (off == 0)
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 9cd2661aa1e..3a1f0f37389 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.42 2001/10/09 09:21:10 brian Exp $	*/
+/*	$OpenBSD: route.c,v 1.43 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-static char *rcsid = "$OpenBSD: route.c,v 1.42 2001/10/09 09:21:10 brian Exp $";
+static char *rcsid = "$OpenBSD: route.c,v 1.43 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -274,7 +274,7 @@ pr_encaphdr()
 
 static struct sockaddr *
 kgetsa(dst)
-	register struct sockaddr *dst;
+	struct sockaddr *dst;
 {
 
 	kget(dst, pt_u.u_sa);
@@ -358,7 +358,7 @@ ntreestuff()
 	size_t needed;
 	int mib[6];
 	char *buf, *next, *lim;
-	register struct rt_msghdr *rtm;
+	struct rt_msghdr *rtm;
 
 	mib[0] = CTL_NET;
 	mib[1] = PF_ROUTE;
@@ -387,9 +387,9 @@ ntreestuff()
 
 static void
 np_rtentry(rtm)
-	register struct rt_msghdr *rtm;
+	struct rt_msghdr *rtm;
 {
-	register struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
+	struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
 #ifdef notdef
 	static int masks_done, banner_printed;
 #endif
@@ -431,14 +431,14 @@ p_sockaddr(sa, mask, flags, width)
 	int flags, width;
 {
 	char workbuf[128], *cplim;
-	register char *cp = workbuf;
+	char *cp = workbuf;
 	size_t n;
 
 	switch (sa->sa_family) {
 	case AF_INET:
 	    {
-		register struct sockaddr_in *sin = (struct sockaddr_in *)sa;
-		register struct sockaddr_in *msin = (struct sockaddr_in *)mask;
+		struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+		struct sockaddr_in *msin = (struct sockaddr_in *)mask;
 
 		cp = (sin->sin_addr.s_addr == 0) ? "default" :
 		      ((flags & RTF_HOST) || mask == NULL ?
@@ -488,7 +488,7 @@ p_sockaddr(sa, mask, flags, width)
 		
 	case AF_LINK:
 	    {
-		register struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa;
+		struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa;
 
 		if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 &&
 		    sdl->sdl_slen == 0)
@@ -497,8 +497,8 @@ p_sockaddr(sa, mask, flags, width)
 		else switch (sdl->sdl_type) {
 		case IFT_ETHER:
 		    {
-			register int i;
-			register u_char *lla = (u_char *)sdl->sdl_data +
+			int i;
+			u_char *lla = (u_char *)sdl->sdl_data +
 			    sdl->sdl_nlen;
 
 			cplim = "";
@@ -531,7 +531,7 @@ p_sockaddr(sa, mask, flags, width)
 	    }
 	default:
 	    {
-		register u_char *s = (u_char *)sa->sa_data, *slim;
+		u_char *s = (u_char *)sa->sa_data, *slim;
 
 		slim = sa->sa_len + (u_char *) sa;
 		cplim = cp + sizeof(workbuf) - 6;
@@ -572,11 +572,11 @@ p_sockaddr(sa, mask, flags, width)
 
 static void
 p_flags(f, format)
-	register int f;
+	int f;
 	char *format;
 {
 	char name[33], *flags;
-	register struct bits *p = bits;
+	struct bits *p = bits;
 
 	for (flags = name; p->b_mask; p++)
 		if (p->b_mask & f)
@@ -587,7 +587,7 @@ p_flags(f, format)
 
 static void
 p_rtentry(rt)
-	register struct rtentry *rt;
+	struct rtentry *rt;
 {
 	static struct ifnet ifnet, *lastif;
 	struct sockaddr_storage sock1, sock2;
@@ -652,7 +652,7 @@ char *
 routename(in)
 	in_addr_t in;
 {
-	register char *cp;
+	char *cp;
 	static char line[MAXHOSTNAMELEN];
 	struct hostent *hp;
 	static char domain[MAXHOSTNAMELEN];
@@ -874,15 +874,16 @@ short ns_bh[] = {-1,-1,-1};
 
 char *
 ns_print(sa)
-	register struct sockaddr *sa;
+	struct sockaddr *sa;
 {
-	register struct sockaddr_ns *sns = (struct sockaddr_ns*)sa;
+	struct sockaddr_ns *sns = (struct sockaddr_ns*)sa;
 	struct ns_addr work;
 	union { union ns_net net_e; u_long long_e; } net;
 	in_port_t port;
 	static char mybuf[50], cport[10], chost[25];
 	char *host = "";
-	register char *p; register u_char *q;
+	char *p;
+	u_char *q;
 
 	work = sns->sns_addr;
 	port = ntohs(work.x_port);
@@ -924,7 +925,7 @@ char *
 ns_phost(sa)
 	struct sockaddr *sa;
 {
-	register struct sockaddr_ns *sns = (struct sockaddr_ns *)sa;
+	struct sockaddr_ns *sns = (struct sockaddr_ns *)sa;
 	struct sockaddr_ns work;
 	static union ns_net ns_zeronet;
 	char *p;
@@ -943,15 +944,15 @@ u_short ipx_bh[] = {0xffff,0xffff,0xffff};
 
 char *
 ipx_print(sa)
-	register struct sockaddr *sa;
+	struct sockaddr *sa;
 {
-	register struct sockaddr_ipx *sipx = (struct sockaddr_ipx*)sa;
+	struct sockaddr_ipx *sipx = (struct sockaddr_ipx*)sa;
 	struct ipx_addr work;
 	union { union ipx_net net_e; u_long long_e; } net;
 	in_port_t port;
 	static char mybuf[50], cport[10], chost[25];
 	char *host = "";
-	register char *q;
+	char *q;
 
 	work = sipx->sipx_addr;
 	port = ntohs(work.ipx_port);
@@ -991,7 +992,7 @@ char *
 ipx_phost(sa)
 	struct sockaddr *sa;
 {
-	register struct sockaddr_ipx *sipx = (struct sockaddr_ipx *)sa;
+	struct sockaddr_ipx *sipx = (struct sockaddr_ipx *)sa;
 	struct sockaddr_ipx work;
 	static union ipx_net ipx_zeronet;
 	char *p;
@@ -1007,7 +1008,7 @@ ipx_phost(sa)
 
 static void
 encap_print(rt)
-	register struct rtentry *rt;
+	struct rtentry *rt;
 {
 	struct sockaddr_encap sen1, sen2, sen3;
         struct ipsec_policy ipo;
@@ -1119,7 +1120,7 @@ void
 upHex(p0)
 	char *p0;
 {
-	register char *p = p0;
+	char *p = p0;
 	for (; *p; p++) switch (*p) {
 
 	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 2547eb0ba11..102e2981f83 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unix.c,v 1.6 1999/12/08 12:30:17 itojun Exp $	*/
+/*	$OpenBSD: unix.c,v 1.7 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: unix.c,v 1.13 1995/10/03 21:42:48 thorpej Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)unix.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: unix.c,v 1.6 1999/12/08 12:30:17 itojun Exp $";
+static char *rcsid = "$OpenBSD: unix.c,v 1.7 2001/11/19 19:02:15 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -76,7 +76,7 @@ void
 unixpr(off)
 	u_long	off;
 {
-	register struct file *fp;
+	struct file *fp;
 	struct socket sock, *so = &sock;
 	char *filebuf;
 	struct protosw *unixsw = (struct protosw *)off;
@@ -105,7 +105,7 @@ static	char *socktype[] =
 
 static void
 unixdomainpr(so, soaddr)
-	register struct socket *so;
+	struct socket *so;
 	caddr_t soaddr;
 {
 	struct unpcb unpcb, *unp = &unpcb;
diff --git a/usr.bin/newsyslog/newsyslog.c b/usr.bin/newsyslog/newsyslog.c
index a3e95297e13..cbe227ba895 100644
--- a/usr.bin/newsyslog/newsyslog.c
+++ b/usr.bin/newsyslog/newsyslog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newsyslog.c,v 1.38 2001/11/16 23:49:07 deraadt Exp $	*/
+/*	$OpenBSD: newsyslog.c,v 1.39 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -88,7 +88,7 @@ provided "as is" without express or implied warranty.
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.38 2001/11/16 23:49:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.39 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #ifndef CONF
@@ -764,7 +764,7 @@ age_old_log(file)
 /* Skip Over Blanks */
 char *
 sob(p)
-	register char   *p;
+	char   *p;
 {
 	while (p && *p && isspace(*p))
 		p++;
@@ -774,7 +774,7 @@ sob(p)
 /* Skip Over Non-Blanks */
 char *
 son(p)
-	register char   *p;
+	char   *p;
 {
 	while (p && *p && !isspace(*p))
 		p++;
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index b991992e5a9..ea757a0ca49 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nm.c,v 1.14 2001/08/17 16:29:33 espie Exp $	*/
+/*	$OpenBSD: nm.c,v 1.15 2001/11/19 19:02:15 mpech Exp $	*/
 /*	$NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)nm.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: nm.c,v 1.14 2001/08/17 16:29:33 espie Exp $";
+static char rcsid[] = "$OpenBSD: nm.c,v 1.15 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -340,7 +340,7 @@ show_objfile(objname, fp)
 {
 	struct nlist *names, *np;
 	struct nlist **snames;
-	register int i, nnames, nrawnames;
+	int i, nnames, nrawnames;
 	struct exec head;
 	long stabsize;
 	char *stab;
diff --git a/usr.bin/oldrdist/docmd.c b/usr.bin/oldrdist/docmd.c
index 941663d9787..099a2804040 100644
--- a/usr.bin/oldrdist/docmd.c
+++ b/usr.bin/oldrdist/docmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: docmd.c,v 1.13 2001/07/18 17:17:39 pvalchev Exp $	*/
+/*	$OpenBSD: docmd.c,v 1.14 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)docmd.c	8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: docmd.c,v 1.13 2001/07/18 17:17:39 pvalchev Exp $";
+static char *rcsid = "$OpenBSD: docmd.c,v 1.14 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include "defs.h"
@@ -67,9 +67,9 @@ docmds(dhosts, argc, argv)
 	int argc;
 	char **argv;
 {
-	register struct cmd *c;
-	register struct namelist *f;
-	register char **cpp;
+	struct cmd *c;
+	struct namelist *f;
+	char **cpp;
 	extern struct cmd *cmds;
 
 	signal(SIGHUP, cleanup);
@@ -124,9 +124,9 @@ doarrow(filev, files, rhost, cmds)
 	char *rhost;
 	struct subcmd *cmds;
 {
-	register struct namelist *f;
-	register struct subcmd *sc;
-	register char **cpp;
+	struct namelist *f;
+	struct subcmd *sc;
+	char **cpp;
 	int n, ddir, opts = options;
 
 	if (debug)
@@ -213,7 +213,7 @@ static int
 makeconn(rhost)
 	char *rhost;
 {
-	register char *ruser, *cp;
+	char *ruser, *cp;
 	static char *cur_host = NULL;
 #if	defined(DIRECT_RCMD)
 	static int port = -1;
@@ -344,10 +344,10 @@ lostconn(signo)
 
 static int
 okname(name)
-	register char *name;
+	char *name;
 {
-	register char *cp = name;
-	register int c;
+	char *cp = name;
+	int c;
 
 	do {
 		c = *cp;
@@ -377,9 +377,9 @@ dodcolon(filev, files, stamp, cmds)
 	char *stamp;
 	struct subcmd *cmds;
 {
-	register struct subcmd *sc;
-	register struct namelist *f;
-	register char **cpp;
+	struct subcmd *sc;
+	struct namelist *f;
+	char **cpp;
 	struct timeval tv[2];
 	struct stat stb;
 
@@ -493,9 +493,9 @@ static void
 rcmptime(st)
 	struct stat *st;
 {
-	register DIR *d;
-	register struct direct *dp;
-	register char *cp;
+	DIR *d;
+	struct direct *dp;
+	char *cp;
 	char *otp;
 	int len;
 
@@ -536,10 +536,10 @@ rcmptime(st)
 static void
 notify(file, rhost, to, lmod)
 	char *file, *rhost;
-	register struct namelist *to;
+	struct namelist *to;
 	time_t lmod;
 {
-	register int fd, len;
+	int fd, len;
 	struct stat stb;
 	FILE *pf;
 
@@ -616,7 +616,7 @@ inlist(list, file)
 	struct namelist *list;
 	char *file;
 {
-	register struct namelist *nl;
+	struct namelist *nl;
 
 	for (nl = list; nl != NULL; nl = nl->n_next)
 		if (!strcmp(file, nl->n_name))
@@ -631,8 +631,8 @@ int
 except(file)
 	char *file;
 {
-	register struct	subcmd *sc;
-	register struct	namelist *nl;
+	struct	subcmd *sc;
+	struct	namelist *nl;
 	regex_t s;
 	int err;
 
@@ -664,7 +664,7 @@ except(file)
 
 char *
 colon(cp)
-	register char *cp;
+	char *cp;
 {
 
 	while (*cp) {
diff --git a/usr.bin/oldrdist/expand.c b/usr.bin/oldrdist/expand.c
index 16b14f54c5c..998439c707f 100644
--- a/usr.bin/oldrdist/expand.c
+++ b/usr.bin/oldrdist/expand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expand.c,v 1.7 2001/07/18 17:17:39 pvalchev Exp $	*/
+/*	$OpenBSD: expand.c,v 1.8 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: expand.c,v 1.7 2001/07/18 17:17:39 pvalchev Exp $";
+static char *rcsid = "$OpenBSD: expand.c,v 1.8 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include "defs.h"
@@ -88,8 +88,8 @@ expand(list, wh)
 	struct namelist *list;
 	int wh;
 {
-	register struct namelist *nl, *prev;
-	register int n;
+	struct namelist *nl, *prev;
+	int n;
 	char pathbuf[BUFSIZ];
 	char *argvbuf[GAVSIZ];
 
@@ -99,7 +99,7 @@ expand(list, wh)
 	}
 
 	if (wh == 0) {
-		register char *cp;
+		char *cp;
 
 		for (nl = list; nl != NULL; nl = nl->n_next)
 			for (cp = nl->n_name; *cp; cp++)
@@ -146,8 +146,8 @@ static void
 expstr(s)
 	char *s;
 {
-	register char *cp, *cp1;
-	register struct namelist *tp;
+	char *cp, *cp1;
+	struct namelist *tp;
 	char *tail;
 	char buf[BUFSIZ];
 	int savec, oeargc;
@@ -260,8 +260,8 @@ static void
 expsh(s)
 	char *s;
 {
-	register char *cp;
-	register char *spathp, *oldcp;
+	char *cp;
+	char *spathp, *oldcp;
 	struct stat stb;
 
 	spathp = pathp;
@@ -299,7 +299,7 @@ matchdir(pattern)
 	char *pattern;
 {
 	struct stat stb;
-	register struct direct *dp;
+	struct direct *dp;
 	DIR *dirp;
 
 	dirp = opendir(path);
@@ -340,7 +340,7 @@ execbrc(p, s)
 	char *p, *s;
 {
 	char restbuf[BUFSIZ + 2];
-	register char *pe, *pm, *pl;
+	char *pe, *pm, *pl;
 	int brclev = 0;
 	char *lm, savec, *spathp;
 
@@ -419,8 +419,8 @@ static int
 match(s, p)
 	char *s, *p;
 {
-	register int c;
-	register char *sentp;
+	int c;
+	char *sentp;
 	char sexpany = expany;
 
 	if (*s == '.' && *p != '.')
@@ -435,9 +435,9 @@ match(s, p)
 
 static int
 amatch(s, p)
-	register char *s, *p;
+	char *s, *p;
 {
-	register int scc;
+	int scc;
 	int ok, lc;
 	char *spathp;
 	struct stat stb;
@@ -524,9 +524,9 @@ slash:
 
 static int
 smatch(s, p)
-	register char *s, *p;
+	char *s, *p;
 {
-	register int scc;
+	int scc;
 	int ok, lc;
 	int c, cc;
 
@@ -583,10 +583,10 @@ smatch(s, p)
 
 static void
 Cat(s1, s2)
-	register char *s1, *s2;
+	char *s1, *s2;
 {
 	int len = strlen(s1) + strlen(s2) + 1;
-	register char *s;
+	char *s;
 
 	nleft -= len;
 	if (nleft <= 0 || ++eargc >= GAVSIZ)
@@ -623,10 +623,10 @@ addpath(c)
 char *
 exptilde(buf, file, maxlen)
 	char buf[];
-	register char *file;
+	char *file;
 	int maxlen;
 {
-	register char *s1, *s2, *s3;
+	char *s1, *s2, *s3;
 	extern char homedir[];
 
 	if (*file != '~') {
diff --git a/usr.bin/oldrdist/lookup.c b/usr.bin/oldrdist/lookup.c
index 0da7cd4866f..adbabb9ea64 100644
--- a/usr.bin/oldrdist/lookup.c
+++ b/usr.bin/oldrdist/lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lookup.c,v 1.5 1996/08/22 20:33:21 millert Exp $	*/
+/*	$OpenBSD: lookup.c,v 1.6 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: lookup.c,v 1.5 1996/08/22 20:33:21 millert Exp $";
+static char *rcsid = "$OpenBSD: lookup.c,v 1.6 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include "defs.h"
@@ -60,8 +60,8 @@ void
 define(name)
 	char *name;
 {
-	register char *cp, *s;
-	register struct namelist *nl;
+	char *cp, *s;
+	struct namelist *nl;
 	struct namelist *value;
 
 	if (debug)
@@ -126,9 +126,9 @@ lookup(name, action, value)
 	int action;
 	struct namelist *value;
 {
-	register unsigned n;
-	register char *cp;
-	register struct syment *s;
+	unsigned n;
+	char *cp;
+	struct syment *s;
 	char buf[BUFSIZ];
 
 	if (debug)
diff --git a/usr.bin/oldrdist/main.c b/usr.bin/oldrdist/main.c
index 90c91936b52..faf358a20c3 100644
--- a/usr.bin/oldrdist/main.c
+++ b/usr.bin/oldrdist/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.9 2001/07/18 17:17:39 pvalchev Exp $	*/
+/*	$OpenBSD: main.c,v 1.10 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: main.c,v 1.9 2001/07/18 17:17:39 pvalchev Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.10 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include "defs.h"
@@ -83,7 +83,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register char *arg;
+	char *arg;
 	int cmdargs = 0;
 	char *dhosts[NHOSTS], **hp = dhosts;
 
@@ -244,8 +244,8 @@ docmdargs(nargs, args)
 	int nargs;
 	char *args[];
 {
-	register struct namelist *nl, *prev;
-	register char *cp;
+	struct namelist *nl, *prev;
+	char *cp;
 	struct namelist *files, *hosts;
 	struct subcmd *cmds;
 	char *dest;
@@ -297,7 +297,7 @@ docmdargs(nargs, args)
  */
 void
 prnames(nl)
-	register struct namelist *nl;
+	struct namelist *nl;
 {
 	printf("( ");
 	while (nl != NULL) {
@@ -341,7 +341,7 @@ warn(fmt, va_alist)
 char *xbasename(path)
 	char *path;
 {
-	register char *cp;
+	char *cp;
 
 	if (cp = strrchr(path, '/'))
 		return(cp+1);
diff --git a/usr.bin/oldrdist/server.c b/usr.bin/oldrdist/server.c
index fa519e27a66..372d3d670cf 100644
--- a/usr.bin/oldrdist/server.c
+++ b/usr.bin/oldrdist/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.14 2001/09/05 22:32:42 deraadt Exp $	*/
+/*	$OpenBSD: server.c,v 1.15 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)server.c	8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: server.c,v 1.14 2001/09/05 22:32:42 deraadt Exp $";
+static char *rcsid = "$OpenBSD: server.c,v 1.15 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/wait.h>
@@ -84,7 +84,7 @@ void
 server()
 {
 	char cmdbuf[BUFSIZ];
-	register char *cp;
+	char *cp;
 
 	signal(SIGHUP, cleanup);
 	signal(SIGINT, cleanup);
@@ -361,7 +361,7 @@ sendf(rname, opts)
 	char *rname;
 	int opts;
 {
-	register struct subcmd *sc;
+	struct subcmd *sc;
 	struct stat stb;
 	int sizerr, f, u, len;
 	off_t i;
@@ -599,9 +599,9 @@ update(rname, opts, stp)
 	int opts;
 	struct stat *stp;
 {
-	register char *cp, *s;
-	register off_t size;
-	register time_t mtime;
+	char *cp, *s;
+	off_t size;
+	time_t mtime;
 
 	if (debug) 
 		printf("update(%s, %x, %x)\n", rname, opts, stp);
@@ -736,7 +736,7 @@ recvf(cmd, type)
 	char *cmd;
 	int type;
 {
-	register char *cp = cmd;
+	char *cp = cmd;
 	int f = -1, mode, opts = 0, wrerr, olderrno;
 	off_t i, size;
 	time_t mtime;
@@ -990,7 +990,7 @@ static void
 hardlink(cmd)
 	char *cmd;
 {
-	register char *cp = cmd;
+	char *cp = cmd;
 	struct stat stb;
 	char *oldname;
 	int opts = 0, exists = 0;
@@ -1046,7 +1046,7 @@ static int
 chkparent(name)
 	char *name;
 {
-	register char *cp;
+	char *cp;
 	struct stat stb;
 
 	cp = strrchr(name, '/');
@@ -1076,7 +1076,7 @@ fchog(fd, file, owner, group, mode)
 	char *file, *owner, *group;
 	int mode;
 {
-	register int i;
+	int i;
 	int uid, gid;
 	extern char user[];
 	extern int userid;
@@ -1138,7 +1138,7 @@ static void
 rmchk(opts)
 	int opts;
 {
-	register char *cp, *s;
+	char *cp, *s;
 	struct stat stb;
 
 	if (debug)
@@ -1219,10 +1219,10 @@ rmchk(opts)
  */
 static void
 clean(cp)
-	register char *cp;
+	char *cp;
 {
 	DIR *d;
-	register struct direct *dp;
+	struct direct *dp;
 	struct stat stb;
 	char *otp;
 	int len, opts;
@@ -1297,7 +1297,7 @@ removeit(stp)
 {
 	DIR *d;
 	struct direct *dp;
-	register char *cp;
+	char *cp;
 	struct stat stb;
 	char *otp;
 	int len;
@@ -1365,7 +1365,7 @@ dospecial(cmd)
 	char *cmd;
 {
 	int fd[2], status, pid, i;
-	register char *cp, *s;
+	char *cp, *s;
 	char sbuf[BUFSIZ];
 	extern int userid, groupid;
 
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index 97dc5098ae8..932e9fe6026 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local_passwd.c,v 1.21 2001/08/27 02:57:07 millert Exp $	*/
+/*	$OpenBSD: local_passwd.c,v 1.22 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static const char sccsid[] = "from: @(#)local_passwd.c	5.5 (Berkeley) 5/6/91";*/
-static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.21 2001/08/27 02:57:07 millert Exp $";
+static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.22 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -148,7 +148,7 @@ getnewpasswd(pw, lc, authenticated)
 	login_cap_t *lc;
 	int authenticated;
 {
-	register char *p;
+	char *p;
 	int tries, pwd_tries;
 	char buf[_PASSWORD_LEN+1], salt[_PASSWORD_LEN];
 
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index bc546a9aa75..944dd68e948 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: passwd.c,v 1.12 2001/08/19 20:29:23 millert Exp $	*/
+/*	$OpenBSD: passwd.c,v 1.13 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static const char sccsid[] = "from: @(#)passwd.c	5.5 (Berkeley) 7/6/91";*/
-static const char rcsid[] = "$OpenBSD: passwd.c,v 1.12 2001/08/19 20:29:23 millert Exp $";
+static const char rcsid[] = "$OpenBSD: passwd.c,v 1.13 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -80,7 +80,7 @@ main(argc, argv)
 	char **argv;
 {
 	extern int optind;
-	register int ch;
+	int ch;
 	char *username;
 	int status = 0;
 #if defined(KERBEROS) || defined(KERBEROS5)
diff --git a/usr.bin/passwd/pwd_gensalt.c b/usr.bin/passwd/pwd_gensalt.c
index 548d6198506..d7c3bbc9d03 100644
--- a/usr.bin/passwd/pwd_gensalt.c
+++ b/usr.bin/passwd/pwd_gensalt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwd_gensalt.c,v 1.10 2001/06/18 21:09:24 millert Exp $ */
+/* $OpenBSD: pwd_gensalt.c,v 1.11 2001/11/19 19:02:15 mpech Exp $ */
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
  * All rights reserved.
@@ -139,9 +139,9 @@ static unsigned char itoa64[] =	 /* 0 ... 63 => ascii - 64 */
 
 void
 to64(s, v, n)
-	register char *s;
-	register int32_t v;
-	register int n;
+	char *s;
+	int32_t v;
+	int n;
 {
 	while (--n >= 0) {
 		*s++ = itoa64[v&0x3f];
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 202dc58293c..8b77b2b7268 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: paste.c,v 1.8 2000/06/07 14:20:15 aaron Exp $	*/
+/*	$OpenBSD: paste.c,v 1.9 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -44,7 +44,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)paste.c	5.7 (Berkeley) 10/30/90";*/
-static char rcsid[] = "$OpenBSD: paste.c,v 1.8 2000/06/07 14:20:15 aaron Exp $";
+static char rcsid[] = "$OpenBSD: paste.c,v 1.9 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -111,9 +111,9 @@ void
 parallel(argv)
 	char **argv;
 {
-	register LIST *lp;
-	register int cnt;
-	register char ch, *p;
+	LIST *lp;
+	int cnt;
+	char ch, *p;
 	LIST *head, *tmp;
 	int opencnt, output;
 	char *buf, *lbuf;
@@ -193,9 +193,9 @@ void
 sequential(argv)
 	char **argv;
 {
-	register FILE *fp;
-	register int cnt;
-	register char ch, *p, *dp;
+	FILE *fp;
+	int cnt;
+	char ch, *p, *dp;
 	char *buf, *lbuf;
 	size_t len;
 
@@ -242,8 +242,8 @@ int
 tr(arg)
 	char *arg;
 {
-	register int cnt;
-	register char ch, *p;
+	int cnt;
+	char ch, *p;
 
 	for (p = arg, cnt = 0; (ch = *p++); ++arg, ++cnt)
 		if (ch == '\\')
diff --git a/usr.bin/patch/malloc.c b/usr.bin/patch/malloc.c
index 60db44c77c8..352eaa04f5b 100644
--- a/usr.bin/patch/malloc.c
+++ b/usr.bin/patch/malloc.c
@@ -1,4 +1,4 @@
-/* *	$OpenBSD: malloc.c,v 1.2 1996/06/10 11:21:29 niklas Exp $*/
+/* *	$OpenBSD: malloc.c,v 1.3 2001/11/19 19:02:15 mpech Exp $*/
 /*
  *	from: @(#)nmalloc.c 1 (Caltech) 2/21/82
  *
@@ -134,11 +134,11 @@ malloc_init (end)
 
 static
 morecore (nu)			/* ask system for more memory */
-    register int nu; {		/* size index to get more of  */
+    int nu; {		/* size index to get more of  */
 	char   *sbrk ();
-	register char  *cp;
-	register int    nblks;
-	register int    siz;
+	char  *cp;
+	int    nblks;
+	int    siz;
 
 #ifdef	M_WARN
 #ifndef BSD42
@@ -214,8 +214,8 @@ morecore (nu)			/* ask system for more memory */
 
 static
 getpool () {
-	register int nu;
-	register char *cp = sbrk (0);
+	int nu;
+	char *cp = sbrk (0);
 
 	if ((int) cp & 0x3ff)	/* land on 1K boundaries */
 	    sbrk (1024 - ((int) cp & 0x3ff));
@@ -245,15 +245,15 @@ getpool () {
 char *
 malloc (n)		/* get a block */
     unsigned n; {
-	register struct  mhead *p;
-	register unsigned int  nbytes;
-	register int    nunits = 0;
+	struct  mhead *p;
+	unsigned int  nbytes;
+	int    nunits = 0;
 
 	/* Figure out how many bytes are required, rounding up to the nearest
 	multiple of 4, then figure out which nextf[] area to use */
 	nbytes = (n + sizeof *p + EXTRA + 3) & ~3;
 		{
-		register unsigned int   shiftr = (nbytes - 1) >> 2;
+		unsigned int   shiftr = (nbytes - 1) >> 2;
 
 		while (shiftr >>= 1)
 		    nunits++;
@@ -285,7 +285,7 @@ malloc (n)		/* get a block */
 	p -> mh_nbytes = n;
 	p -> mh_magic4 = MAGIC4;
 		{
-		register char  *m = (char *) (p + 1) + n;
+		char  *m = (char *) (p + 1) + n;
 
 		*m++ = MAGIC1, *m++ = MAGIC1, *m++ = MAGIC1, *m = MAGIC1;
 		}
@@ -300,9 +300,9 @@ malloc (n)		/* get a block */
 
 free (mem)
     char *mem; {
-	register struct mhead *p;
+	struct mhead *p;
 		{
-		register char *ap = mem;
+		char *ap = mem;
 
 		ASSERT (ap != 0);
 		p = (struct mhead *) ap - 1;
@@ -315,7 +315,7 @@ free (mem)
 #endif /* rcheck */
 		}
 		{
-		register int nunits = p -> mh_index;
+		int nunits = p -> mh_index;
 
 		ASSERT (nunits <= 29);
 		p -> mh_alloc = ISFREE;
@@ -331,11 +331,11 @@ free (mem)
 char *
 realloc (mem, n)
     char *mem;
-    register unsigned n; {
-	register struct mhead *p;
-	register unsigned int tocopy;
-	register int nbytes;
-	register int nunits;
+    unsigned n; {
+	struct mhead *p;
+	unsigned int tocopy;
+	int nbytes;
+	int nunits;
 
 	if ((p = (struct mhead *) mem) == 0)
 	    return malloc (n);
@@ -345,7 +345,7 @@ realloc (mem, n)
 #ifdef rcheck
 	ASSERT (p -> mh_magic4 == MAGIC4);
 		{
-		register char *m = mem + (tocopy = p -> mh_nbytes);
+		char *m = mem + (tocopy = p -> mh_nbytes);
 		ASSERT (*m++ == MAGIC1); ASSERT (*m++ == MAGIC1);
 		ASSERT (*m++ == MAGIC1); ASSERT (*m   == MAGIC1);
 		}
@@ -362,7 +362,7 @@ realloc (mem, n)
 	/* If ok, use the same block, just marking its size as changed.  */
 	if (nbytes > (4 << nunits) && nbytes <= (8 << nunits)) {
 #ifdef rcheck
-		register char *m = mem + tocopy;
+		char *m = mem + tocopy;
 		*m++ = 0;  *m++ = 0;  *m++ = 0;  *m++ = 0;
 		p-> mh_nbytes = n;
 		m = mem + n;
@@ -375,7 +375,7 @@ realloc (mem, n)
 	if (n < tocopy)
 	    tocopy = n;
 		{
-		register char *new;
+		char *new;
 		void bcopy();	/*HMS: here? */
 
 		if ((new = malloc (n)) == 0)
@@ -399,8 +399,8 @@ struct mstats_value
 malloc_stats (size)
     int size; {
 	struct mstats_value v;
-	register int i;
-	register struct mhead *p;
+	int i;
+	struct mhead *p;
 
 	v.nfree = 0;
 
@@ -421,9 +421,9 @@ malloc_stats (size)
 /* how much space is available? */
 
 unsigned freespace() {
-  	register int i, j;
-  	register struct mhead *p;
-  	register unsigned space = 0;
+  	int i, j;
+  	struct mhead *p;
+  	unsigned space = 0;
 	int local;	/* address only is used */
 
 	space = (char *)&local - sbrk(0);	/* stack space */
@@ -438,7 +438,7 @@ unsigned freespace() {
 
 unsigned mc_size(cp)
     char *cp;{
-	register struct mhead *p;
+	struct mhead *p;
 
 	if ((p = (struct mhead *) cp) == 0) {
 		/*HMS? */
@@ -460,9 +460,9 @@ unsigned mc_size(cp)
 /*HMS: Really should use memcpy, if available... */
 
 void bcopy(source, dest, len)
-    register char *source, *dest;
-    register len; {
-	register i;
+    char *source, *dest;
+    len; {
+	i;
 	
 	for (i = 0; i < len; i++)
 	    *dest++ = *source++;}
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 08b365adcb3..54dd2a2fbc1 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: egetopt.c,v 1.3 1999/05/23 17:37:41 millert Exp $	*/
+/*	$OpenBSD: egetopt.c,v 1.4 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1991 Keith Muller.
@@ -39,7 +39,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)egetopt.c	8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: egetopt.c,v 1.3 1999/05/23 17:37:41 millert Exp $";
+static char *rcsid = "$OpenBSD: egetopt.c,v 1.4 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -76,9 +76,9 @@ egetopt(nargc, nargv, ostr)
 	const char *ostr;
 {
 	static char *place = EMSG;	/* option letter processing */
-	register char *oli;		/* option letter list index */
+	char *oli;			/* option letter list index */
 	static int delim;		/* which option delimeter */
-	register char *p;
+	char *p;
 	static char savec = '\0';
 
 	if (savec != '\0') {
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 76bf104b563..9dcb580f320 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pr.c,v 1.12 2001/11/19 03:37:33 deraadt Exp $	*/
+/*	$OpenBSD: pr.c,v 1.13 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1991 Keith Muller.
@@ -45,7 +45,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)pr.c	8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: pr.c,v 1.12 2001/11/19 03:37:33 deraadt Exp $";
+static char *rcsid = "$OpenBSD: pr.c,v 1.13 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -188,10 +188,10 @@ onecol(argc, argv)
     int argc;
     char *argv[];
 {
-    register int off;
-    register int lrgln;
-    register int linecnt;
-    register int num;
+    int off;
+    int lrgln;
+    int linecnt;
+    int num;
     int cnt;
     int rc;
     int lncnt;
@@ -351,12 +351,12 @@ vertcol(argc, argv)
 	int argc;
 	char *argv[];
 {
-    register char *ptbf;
-    register char **lstdat;
-    register int i;
-    register int j;
-    register int pln;
-    register int *indy;
+    char *ptbf;
+    char **lstdat;
+    int i;
+    int j;
+    int pln;
+    int *indy;
     int cnt;
     int rc;
     int cvc;
@@ -679,12 +679,12 @@ horzcol(argc, argv)
 	int argc;
 	char *argv[];
 {
-    register char *ptbf;
-    register int pln;
-    register char *lstdat;
-    register int col = colwd + 1;
-    register int j;
-    register int i;
+    char *ptbf;
+    int pln;
+    char *lstdat;
+    int col = colwd + 1;
+    int j;
+    int i;
     int cnt;
     int rc;
     int lncnt;
@@ -883,13 +883,13 @@ mulfile(argc, argv)
     int argc;
     char *argv[];
 {
-    register char *ptbf;
-    register int j;
-    register int pln;
+    char *ptbf;
+    int j;
+    int pln;
     int *rc;
     int cnt;
-    register char *lstdat;
-    register int i;
+    char *lstdat;
+    int i;
     FILE **fbuf;
     int actf;
     int lncnt;
@@ -1120,17 +1120,17 @@ int
 inln(inf, buf, lim, cnt, cps, trnc, mor)
     FILE *inf;
     char *buf;
-    register int lim;
+    int lim;
     int *cnt;
     int *cps;
     int trnc;
     int *mor;
 {
-    register int col;
-    register int gap = ingap;
-    register int ch = -1;
-    register char *ptbuf;
-    register int chk = (int)inchar;
+    int col;
+    int gap = ingap;
+    int ch = -1;
+    char *ptbuf;
+    int chk = (int)inchar;
 
     ptbuf = buf;
 
@@ -1239,17 +1239,17 @@ inln(inf, buf, lim, cnt, cps, trnc, mor)
  */
 int
 otln(buf, cnt, svips, svops, mor)
-    register char *buf;
+    char *buf;
     int cnt;
     int *svops;
     int *svips;
     int mor;
 {
-    register int ops;        /* last col output */
-    register int ips;        /* last col in buf examined */
-    register int gap = ogap;
-    register int tbps;
-    register char *endbuf;
+    int ops;        /* last col output */
+    int ips;        /* last col in buf examined */
+    int gap = ogap;
+    int tbps;
+    char *endbuf;
 
     /* skipping is only changed at header time not mid-line! */
     if (skipping)
@@ -1402,11 +1402,11 @@ otln(buf, cnt, svips, svops, mor)
 int
 inskip(inf, pgcnt, lncnt)
     FILE *inf;
-    register int pgcnt;
-    register int lncnt;
+    int pgcnt;
+    int lncnt;
 {
-    register int c;
-    register int cnt;
+    int c;
+    int cnt;
 
     while(--pgcnt > 0) {
 	cnt = lncnt;
@@ -1571,11 +1571,11 @@ nxtfile(argc, argv, fname, buf, dt)
  */
 void
 addnum(buf, wdth, line)
-    register char *buf;
-    register int wdth;
-    register int line;
+    char *buf;
+    int wdth;
+    int line;
 {
-    register char *pt = buf + wdth;
+    char *pt = buf + wdth;
 
     do {
 	*--pt = digs[line % 10];
@@ -1655,7 +1655,7 @@ prhead(buf, fname, pagcnt)
  */
 int
 prtail(cnt, incomp)
-    register int cnt;
+    int cnt;
     int incomp;
 {
     /*
@@ -1781,10 +1781,10 @@ usage()
  */
 int
 setup(argc, argv)
-    register int argc;
-    register char **argv;
+    int argc;
+    char **argv;
 {
-    register int c;
+    int c;
     int eflag = 0;
     int iflag = 0;
     int wflag = 0;
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index cd9593af6f3..b0b50313198 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printenv.c,v 1.2 1996/06/26 05:37:57 deraadt Exp $	*/
+/*	$OpenBSD: printenv.c,v 1.3 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1987 Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)printenv.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: printenv.c,v 1.2 1996/06/26 05:37:57 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: printenv.c,v 1.3 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -60,8 +60,8 @@ main(argc, argv)
 	char **argv;
 {
 	extern char **environ;
-	register char *cp, **ep;
-	register int len;
+	char *cp, **ep;
+	int len;
 
 	if (argc < 2) {
 		for (ep = environ; *ep; ep++)
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 50351b8e125..a72b597572b 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printf.c,v 1.4 2000/12/22 22:53:10 deraadt Exp $	*/
+/*	$OpenBSD: printf.c,v 1.5 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -43,7 +43,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)printf.c	5.9 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: printf.c,v 1.4 2000/12/22 22:53:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: printf.c,v 1.5 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -131,8 +131,8 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register char *fmt, *start;
-	register int fieldwidth, precision;
+	char *fmt, *start;
+	int fieldwidth, precision;
 	char convch, nextch;
 	char *format;
 	int ch;
@@ -282,7 +282,7 @@ main(argc, argv)
  */
 static int
 print_escape_str(str)
-	register const char *str;
+	const char *str;
 {
 	int value;
 	int c;
@@ -323,7 +323,7 @@ print_escape_str(str)
  */
 static int
 print_escape(str)
-	register const char *str;
+	const char *str;
 {
 	const char *start = str;
 	int value;
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index 633def9dbe6..9fb7fa41235 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: build.c,v 1.7 1999/09/21 13:15:43 espie Exp $	*/
+/*	$OpenBSD: build.c,v 1.8 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)build.c	5.3 (Berkeley) 3/12/91";*/
-static char rcsid[] = "$OpenBSD: build.c,v 1.7 1999/09/21 13:15:43 espie Exp $";
+static char rcsid[] = "$OpenBSD: build.c,v 1.8 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -141,13 +141,13 @@ build()
  */
 static int
 rexec(rfd, wfd)
-	register int rfd;
+	int rfd;
 	int wfd;
 {
-	register RLIB *rp;
-	register long nsyms;
-	register int nr, symlen;
-	register char *strtab = 0;
+	RLIB *rp;
+	long nsyms;
+	int nr, symlen;
+	char *strtab = 0;
 	char *sym;
 	struct exec ebuf;
 	struct nlist nl;
@@ -251,7 +251,7 @@ static void
 symobj(mid)
 	int mid;
 {
-	register RLIB *rp, *rnext;
+	RLIB *rp, *rnext;
 	struct ranlib rn;
 	char hb[sizeof(struct ar_hdr) + 1], pad;
 	long ransize, size, stroff;
diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index 6582cbdf48f..33e10200a4f 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.5 1999/09/21 13:15:43 espie Exp $	*/
+/*	$OpenBSD: misc.c,v 1.6 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)misc.c	5.2 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$OpenBSD: misc.c,v 1.5 1999/09/21 13:15:43 espie Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.6 2001/11/19 19:02:15 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -101,7 +101,7 @@ const char *
 rname(path)
 	const char *path;
 {
-	register const char *ind;
+	const char *ind;
 
 	return((ind = strrchr(path, '/')) ? ind + 1 : path);
 }
diff --git a/usr.bin/rdist/child.c b/usr.bin/rdist/child.c
index ca174485820..b790c8402ce 100644
--- a/usr.bin/rdist/child.c
+++ b/usr.bin/rdist/child.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: child.c,v 1.9 1999/02/05 00:39:08 millert Exp $	*/
+/*	$OpenBSD: child.c,v 1.10 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: child.c,v 6.28 1996/02/22 19:30:09 mcooper Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: child.c,v 1.9 1999/02/05 00:39:08 millert Exp $";
+"$OpenBSD: child.c,v 1.10 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)docmd.c	5.1 (Berkeley) 6/6/85";
@@ -89,7 +89,7 @@ static int 		needscan = FALSE;	/* Need to scan children */
 static void removechild(child)
 	CHILD *child;
 {
-	register CHILD *pc, *prevpc;
+	CHILD *pc, *prevpc;
 
 	debugmsg(DM_CALL, "removechild(%s, %d, %d) start",
 		 child->c_name, child->c_pid, child->c_readfd);
@@ -147,7 +147,7 @@ static void removechild(child)
 static CHILD *copychild(child)
 	CHILD *child;
 {
-	register CHILD *newc;
+	CHILD *newc;
 
 	newc = (CHILD *) xmalloc(sizeof(CHILD));
 
@@ -166,7 +166,7 @@ static CHILD *copychild(child)
 static void addchild(child)
 	CHILD *child;
 {
-	register CHILD *pc;
+	CHILD *pc;
 
 	debugmsg(DM_CALL, "addchild() start\n");
 
@@ -279,7 +279,7 @@ static int waitproc(statval, block)
  */
 static void reap()
 {
-	register CHILD *pc;
+	CHILD *pc;
 	int save_errno = errno;
 	int status = 0;
 	pid_t pid;
@@ -337,7 +337,7 @@ static void reap()
  */
 static void childscan() 
 {
-	register CHILD *pc, *nextpc;
+	CHILD *pc, *nextpc;
 	
 	debugmsg(DM_CALL, "childscan() start");
 
@@ -367,8 +367,8 @@ static void childscan()
 extern void waitup()
 {
 #if	defined(HAVE_SELECT)
-	register int count;
-	register CHILD *pc;
+	int count;
+	CHILD *pc;
 	fd_set *rchildfdsp = NULL;
 	int rchildfdsn = 0;
 	size_t bytes;
diff --git a/usr.bin/rdist/client.c b/usr.bin/rdist/client.c
index 46e712c22cb..2b2883b3aa0 100644
--- a/usr.bin/rdist/client.c
+++ b/usr.bin/rdist/client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: client.c,v 1.12 1999/03/05 01:36:12 millert Exp $	*/
+/*	$OpenBSD: client.c,v 1.13 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: client.c,v 6.80 1996/02/28 20:34:27 mcooper Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: client.c,v 1.12 1999/03/05 01:36:12 millert Exp $";
+"$OpenBSD: client.c,v 1.13 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)client.c";
@@ -84,7 +84,7 @@ char *remfilename(src, dest, path, rname, destdir)
 	int destdir;
 {
 	extern struct namelist *filelist;
-	register char *lname, *cp;
+	char *lname, *cp;
 	static char buff[BUFSIZ];
 	int srclen, pathlen;
 	char *p;
@@ -146,7 +146,7 @@ int inlist(list, file)
 	struct namelist *list;
 	char *file;
 {
-	register struct namelist *nl;
+	struct namelist *nl;
 
 	for (nl = list; nl != NULL; nl = nl->n_next)
 		if (strcmp(file, nl->n_name) == 0)
@@ -163,7 +163,7 @@ static void runspecial(starget, opts, rname, destdir)
 	char *rname;
 	int destdir;
 {
-	register struct subcmd *sc;
+	struct subcmd *sc;
 	extern struct subcmd *subcmds;
 	char *rfile;
 
@@ -200,7 +200,7 @@ static void addcmdspecialfile(starget, rname, destdir)
 {
 	char *rfile;
 	struct namelist *new;
-	register struct subcmd *sc;
+	struct subcmd *sc;
 	extern struct subcmd *subcmds;
 	int isokay = 0;
 
@@ -227,7 +227,7 @@ static void addcmdspecialfile(starget, rname, destdir)
  */
 static void freecmdspecialfiles()
 {
-	register struct namelist *ptr, *save;
+	struct namelist *ptr, *save;
 
 	for (ptr = updfilelist; ptr; ) {
 		if (ptr->n_name) (void) free(ptr->n_name);
@@ -249,8 +249,8 @@ extern void runcmdspecial(cmd, filev, opts)
 	char **filev;
 	opt_t opts;
 {
-	register struct subcmd *sc;
-	register struct namelist *f;
+	struct subcmd *sc;
+	struct namelist *f;
 	int first = TRUE;
 
 	for (sc = cmd->c_cmds; sc != NULL; sc = sc->sc_next) {
@@ -292,7 +292,7 @@ extern void runcmdspecial(cmd, filev, opts)
 int checkfilename(name)
 	char *name;
 {
-	register char *cp;
+	char *cp;
 
 	if (strchr(name, '\n')) {
 		for (cp = name; *cp; cp++)
@@ -498,7 +498,7 @@ static int sendfile(rname, opts, stb, user, group, destdir)
 static int rmchk(opts)
 	opt_t opts;
 {
-	register u_char *s;
+	u_char *s;
 	struct stat stb;
 	int didupdate = 0;
 	int n;
@@ -772,8 +772,8 @@ static int update(rname, opts, statp)
 	opt_t opts;
 	struct stat *statp;
 {
-	register off_t size;
-	register time_t mtime;
+	off_t size;
+	time_t mtime;
 	unsigned short lmode;
 	unsigned short rmode;
 	char *owner = NULL, *group = NULL;
diff --git a/usr.bin/rdist/common.c b/usr.bin/rdist/common.c
index 6df127bbfcc..b42e8533b41 100644
--- a/usr.bin/rdist/common.c
+++ b/usr.bin/rdist/common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.11 2001/07/09 07:04:51 deraadt Exp $	*/
+/*	$OpenBSD: common.c,v 1.12 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: common.c,v 6.82 1998/03/23 23:27:33 michaelc Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: common.c,v 1.11 2001/07/09 07:04:51 deraadt Exp $";
+"$OpenBSD: common.c,v 1.12 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)common.c";
@@ -95,7 +95,7 @@ extern WRITE_RETURN_T xwrite(fd, buf, len)
 {
     	WRITE_AMT_T nleft = len;
 	WRITE_RETURN_T nwritten;
-	register char *ptr = buf;
+	char *ptr = buf;
          
 	while (nleft > 0) {
 	    	if ((nwritten = write(fd, ptr, nleft)) <= 0) {
@@ -114,7 +114,7 @@ extern WRITE_RETURN_T xwrite(fd, buf, len)
 extern void setprogname(argv)
 	char **argv;
 {
-	register char *cp;
+	char *cp;
 
 	if (!progname) {
 		progname = xstrdup(argv[0]);
@@ -132,8 +132,8 @@ extern int init(argc, argv, envp)
 	char **argv;
 	char **envp;
 {
-	register int i;
-	register char *cp;
+	int i;
+	char *cp;
 
 	if (!isserver)
 		(void) signal(SIGSEGV, sighandler);
@@ -438,12 +438,12 @@ static int remmore()
  * the third argument is nonzero, this routine never returns failure.
  */
 extern int remline(buffer, space, doclean)
-	register u_char *buffer;
+	u_char *buffer;
 	int space;
 	int doclean;
 {
-	register int c, left = space;
-	register u_char *p = buffer;
+	int c, left = space;
+	u_char *p = buffer;
 
 	if (rem_r < 0) {
 		error("Cannot read remote input: Remote descriptor not open.");
@@ -501,7 +501,7 @@ extern int remline(buffer, space, doclean)
 int
 readrem(p, space)
 	char *p;
-	register int space;
+	int space;
 {
 	if (remleft <= 0) {
 		/*
@@ -664,9 +664,9 @@ extern int response()
  */
 extern char *exptilde(ebuf, file)
 	char *ebuf;
-	register char *file;
+	char *file;
 {
-	register char *s1, *s2, *s3;
+	char *s1, *s2, *s3;
 	extern char *homedir;
 
 	if (*file != '~') {
@@ -816,7 +816,7 @@ void runcommand(cmd)
 {
 	int fd[2], pid, i;
 	int status;
-	register char *cp, *s;
+	char *cp, *s;
 	char sbuf[BUFSIZ], buf[BUFSIZ];
 
 	if (pipe(fd) < 0) {
@@ -955,7 +955,7 @@ char *xstrdup(str)
 extern char *xbasename(path)
 	char *path;
 {
-	register char *cp;
+	char *cp;
  
 	if ((cp = strrchr(path, '/')))
 		return(cp+1);
@@ -971,8 +971,8 @@ extern char *xbasename(path)
 extern char *searchpath(path)
 	char *path;
 {
-	register char *cp;
-	register char *file;
+	char *cp;
+	char *file;
 	struct stat statbuf;
 
 	for (; ;) {
diff --git a/usr.bin/rdist/distopt.c b/usr.bin/rdist/distopt.c
index 5e08cbfb4ff..d052b5865f1 100644
--- a/usr.bin/rdist/distopt.c
+++ b/usr.bin/rdist/distopt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: distopt.c,v 1.5 1999/02/04 23:18:57 millert Exp $	*/
+/*	$OpenBSD: distopt.c,v 1.6 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: distopt.c,v 6.10 1996/01/30 01:52:07 mcooper Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: distopt.c,v 1.5 1999/02/04 23:18:57 millert Exp $";
+"$OpenBSD: distopt.c,v 1.6 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)distopt.c";
@@ -88,7 +88,7 @@ DISTOPTINFO distoptinfo[] = {
 extern DISTOPTINFO *getdistopt(name)
 	char *name;
 {
-	register int i;
+	int i;
 
 	for (i = 0; distoptinfo[i].do_name; ++i)
 		if (strcasecmp(name, distoptinfo[i].do_name) == 0)
@@ -107,7 +107,7 @@ extern int parsedistopts(str, optptr, doerrs)
 	opt_t *optptr;
 	int doerrs;
 {
-	register char *string, *optstr;
+	char *string, *optstr;
 	DISTOPTINFO *distopt;
 	int negate;
 
@@ -149,7 +149,7 @@ extern int parsedistopts(str, optptr, doerrs)
  */
 extern char *getdistoptlist()
 {
-	register int i;
+	int i;
 	static char buf[1024];
 
 	for (i = 0, buf[0] = CNULL; distoptinfo[i].do_name; ++i) {
@@ -171,7 +171,7 @@ extern char *getdistoptlist()
 extern char *getondistoptlist(opts)
 	opt_t opts;
 {
-	register int i;
+	int i;
 	static char buf[1024];
 
 	for (i = 0, buf[0] = CNULL; distoptinfo[i].do_name; ++i) {
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 104374469c3..5bea1130fa1 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: docmd.c,v 1.9 2001/06/23 23:08:16 millert Exp $	*/
+/*	$OpenBSD: docmd.c,v 1.10 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: docmd.c,v 6.86 1996/01/30 02:29:43 mcooper Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: docmd.c,v 1.9 2001/06/23 23:08:16 millert Exp $";
+"$OpenBSD: docmd.c,v 1.10 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)docmd.c	5.1 (Berkeley) 6/6/85";
@@ -99,10 +99,10 @@ static void closeconn()
  */
 static void notify(rhost, to, lmod)
 	char *rhost;
-	register struct namelist *to;
+	struct namelist *to;
 	time_t lmod;
 {
-	register int fd, len;
+	int fd, len;
 	FILE *pf, *popen();
 	struct stat stb;
 	static char buf[BUFSIZ];
@@ -221,7 +221,7 @@ extern void markassigned(cmd, cmdlist)
 	struct cmd *cmd;
 	struct cmd *cmdlist;
 {
-	register struct cmd *pcmd;
+	struct cmd *pcmd;
 	
 	for (pcmd = cmdlist; pcmd; pcmd = pcmd->c_next) {
 		checkcmd(pcmd);
@@ -238,7 +238,7 @@ static void markfailed(cmd, cmdlist)
 	struct cmd *cmd;
 	struct cmd *cmdlist;
 {
-	register struct cmd *pc;
+	struct cmd *pc;
 
 	if (!cmd) {
 		debugmsg(DM_MISC, "markfailed() NULL cmd parameter");
@@ -310,7 +310,7 @@ static int remotecmd(rhost, luser, ruser, cmd)
 static int makeconn(rhost)
 	char *rhost;
 {
-	register char *ruser, *cp;
+	char *ruser, *cp;
 	static char *cur_host = NULL;
 	extern char *locuser;
 	extern long min_freefiles, min_freespace;
@@ -431,9 +431,9 @@ static void doarrow(cmd, filev)
 	struct cmd *cmd;
 	char **filev;
 {
-	register struct namelist *f;
-	register struct subcmd *sc;
-	register char **cpp;
+	struct namelist *f;
+	struct subcmd *sc;
+	char **cpp;
 	int n, ddir, destdir;
 	struct namelist *files;
 	struct subcmd *sbcmds;
@@ -586,7 +586,7 @@ done:
 			notify(rhost, sc->sc_args, (time_t) 0);
 
 	if (!nflag) {
-		register struct linkbuf *nextl, *l;
+		struct linkbuf *nextl, *l;
 
 		for (l = ihead; l != NULL; freelinkinfo(l), l = nextl) {
 			nextl = l->nextp;
@@ -605,10 +605,10 @@ done:
 
 int
 okname(name)
-	register char *name;
+	char *name;
 {
-	register char *cp = name;
-	register int c, isbad;
+	char *cp = name;
+	int c, isbad;
 
 	for (isbad = FALSE; *cp && !isbad; ++cp) {
 		c = *cp;
@@ -630,9 +630,9 @@ static void rcmptime(st, sbcmds, env)
 	struct subcmd *sbcmds;
 	char **env;
 {
-	register DIR *d;
-	register DIRENTRY *dp;
-	register char *cp;
+	DIR *d;
+	DIRENTRY *dp;
+	char *cp;
 	char *optarget;
 	int len;
 
@@ -743,9 +743,9 @@ static void dodcolon(cmd, filev)
 	struct cmd *cmd;
 	char **filev;
 {
-	register struct subcmd *sc;
-	register struct namelist *f;
-	register char *cp, **cpp;
+	struct subcmd *sc;
+	struct namelist *f;
+	char *cp, **cpp;
 	struct stat stb;
 	struct namelist *files = cmd->c_files;
 	struct subcmd *sbcmds = cmd->c_cmds;
@@ -827,8 +827,8 @@ static void dodcolon(cmd, filev)
 extern int except(file)
 	char *file;
 {
-	register struct	subcmd *sc;
-	register struct	namelist *nl;
+	struct	subcmd *sc;
+	struct	namelist *nl;
 
 	debugmsg(DM_CALL, "except(%s)", file);
 
@@ -921,8 +921,8 @@ static void docmd(cmd, argc, argv)
 	int argc;
 	char **argv;
 {
-	register struct namelist *f;
-	register int i;
+	struct namelist *f;
+	int i;
 
 	if (argc) {
 		for (i = 0; i < argc; i++) {
@@ -965,9 +965,9 @@ extern void docmds(hostlist, argc, argv)
 	int argc;
 	char **argv;
 {
-	register struct cmd *c;
-	register char *cp;
-	register int i;
+	struct cmd *c;
+	char *cp;
+	int i;
 
 	(void) signal(SIGHUP, sighandler);
 	(void) signal(SIGINT, sighandler);
@@ -1035,7 +1035,7 @@ extern void docmds(hostlist, argc, argv)
 
 		if (hostlist) {
 			/* Do specific hosts as specified on command line */
-			register struct namelist *nlptr;
+			struct namelist *nlptr;
 
 			for (nlptr = hostlist; nlptr; nlptr = nlptr->n_next)
 				/*
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index b102be70c3d..cc6155e53e1 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expand.c,v 1.6 1998/08/13 03:29:09 deraadt Exp $	*/
+/*	$OpenBSD: expand.c,v 1.7 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: expand.c,v 6.18 1998/03/24 00:37:10 michaelc Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: expand.c,v 1.6 1998/08/13 03:29:09 deraadt Exp $";
+"$OpenBSD: expand.c,v 1.7 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)expand.c	5.2 (Berkeley) 3/28/86";
@@ -80,9 +80,9 @@ void    	matchdir();
 		      sizeof(*sortbase), argcmp), sortbase = &eargv[eargc]
 
 static void Cat(s1, s2)				/* quote in s1 and s2 */
-	register u_char *s1, *s2;
+	u_char *s1, *s2;
 {
-	register char *cp;
+	char *cp;
 	int len = strlen((char *)s1) + strlen((char *)s2) + 2;
 
 	if ((eargc + 1) >= MAXEARGS) {
@@ -130,8 +130,8 @@ expand(list, wh)				/* quote in list->n_name */
 	struct namelist *list;
 	int wh;
 {
-	register struct namelist *nl, *prev;
-	register int n;
+	struct namelist *nl, *prev;
+	int n;
 	char pathbuf[BUFSIZ];
 
 	if (debug)
@@ -181,7 +181,7 @@ u_char *xstrchr(str, ch)
 	u_char *str;
 	int ch;
 {
-	register u_char *cp;
+	u_char *cp;
 
 	for (cp = str; cp && *cp != CNULL; ++cp)
 		if (ch == *cp)
@@ -193,8 +193,8 @@ u_char *xstrchr(str, ch)
 void expstr(s)
 	u_char *s;
 {
-	register u_char *cp, *cp1;
-	register struct namelist *tp;
+	u_char *cp, *cp1;
+	struct namelist *tp;
 	u_char *tail;
 	u_char ebuf[BUFSIZ];
 	u_char varbuff[BUFSIZ];
@@ -340,8 +340,8 @@ argcmp(a1, a2)
 void expsh(s)				/* quote in s */
 	u_char *s;
 {
-	register u_char *cp, *oldcp;
-	register char *spathp;
+	u_char *cp, *oldcp;
+	char *spathp;
 	struct stat stb;
 
 	spathp = pathp;
@@ -379,7 +379,7 @@ void matchdir(pattern)				/* quote in pattern */
 	char *pattern;
 {
 	struct stat stb;
-	register DIRENTRY *dp;
+	DIRENTRY *dp;
 	DIR *dirp;
 
 	dirp = opendir(path);
@@ -420,7 +420,7 @@ execbrc(p, s)				/* quote in p */
 	u_char *p, *s;
 {
 	u_char restbuf[BUFSIZ + 2];
-	register u_char *pe, *pm, *pl;
+	u_char *pe, *pm, *pl;
 	int brclev = 0;
 	u_char *lm, savec;
 	char *spathp;
@@ -510,8 +510,8 @@ int
 match(s, p)					/* quote in p */
 	char *s, *p;
 {
-	register int c;
-	register char *sentp;
+	int c;
+	char *sentp;
 	char sexpany = expany;
 
 	if (*s == '.' && *p != '.')
@@ -526,10 +526,10 @@ match(s, p)					/* quote in p */
 
 int
 amatch(s, p)					/* quote in p */
-	register char *s;
-	register u_char *p;
+	char *s;
+	u_char *p;
 {
-	register int scc;
+	int scc;
 	int ok, lc;
 	char *spathp;
 	struct stat stb;
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index 2ed5d7663b5..a839afce822 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lookup.c,v 1.8 1998/06/26 21:21:14 millert Exp $	*/
+/*	$OpenBSD: lookup.c,v 1.9 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: lookup.c,v 6.8 1996/07/19 16:49:55 michaelc Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: lookup.c,v 1.8 1998/06/26 21:21:14 millert Exp $";
+"$OpenBSD: lookup.c,v 1.9 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)lookup.c	5.1 (Berkeley) 6/6/85";
@@ -71,8 +71,8 @@ void
 define(name)
 	char *name;
 {
-	register char *cp, *s;
-	register struct namelist *nl;
+	char *cp, *s;
+	struct namelist *nl;
 	struct namelist *value;
 
 	debugmsg(DM_CALL, "define(%s)", name);
@@ -137,9 +137,9 @@ lookup(name, action, value)	/* %% in name.  Ignore quotas in name */
 	int action;
 	struct namelist *value;
 {
-	register unsigned n;
-	register char *cp;
-	register struct syment *s;
+	unsigned n;
+	char *cp;
+	struct syment *s;
 	char ebuf[BUFSIZ];
 
 	debugmsg(DM_CALL, "lookup(%s, %d, %x)", name, action, value);
diff --git a/usr.bin/rdist/message.c b/usr.bin/rdist/message.c
index 5a960ee2df9..5fd998aa994 100644
--- a/usr.bin/rdist/message.c
+++ b/usr.bin/rdist/message.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: message.c,v 1.9 2000/11/10 15:33:12 provos Exp $	*/
+/*	$OpenBSD: message.c,v 1.10 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: message.c,v 6.24 1996/07/19 17:00:35 michaelc Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: message.c,v 1.9 2000/11/10 15:33:12 provos Exp $";
+"$OpenBSD: message.c,v 1.10 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)common.c";
@@ -96,7 +96,7 @@ MSGFACILITY msgfacility[] = {
  */
 extern void msgprusage()
 {
-	register int i, x;
+	int i, x;
 
 	(void) fprintf(stderr, "\nWhere <msgopt> is of form\n");
 	(void) fprintf(stderr, 
@@ -119,7 +119,7 @@ extern void msgprusage()
  */
 extern void msgprconfig()
 {
-	register int i, x;
+	int i, x;
 	static char buf[MSGBUFSIZ];
 
 	debugmsg(DM_MISC, "Current message logging config:");
@@ -144,7 +144,7 @@ extern void msgprconfig()
 static MSGFACILITY *getmsgfac(name)
 	char *name;
 {
-	register int i;
+	int i;
 
 	for (i = 0; msgfacility[i].mf_name; ++i)
 		if (strcasecmp(name, msgfacility[i].mf_name) == 0)
@@ -159,7 +159,7 @@ static MSGFACILITY *getmsgfac(name)
 static MSGTYPE *getmsgtype(name)
 	char *name;
 {
-	register int i;
+	int i;
 
 	for (i = 0; msgtypes[i].mt_name; ++i)
 		if (strcasecmp(name, msgtypes[i].mt_name) == 0)
@@ -177,9 +177,9 @@ static char *setmsgtypes(msgfac, str)
 	char *str;
 {
 	static char ebuf[BUFSIZ];
-	register char *cp;
-	register char *strptr, *word;
-	register MSGTYPE *mtp;
+	char *cp;
+	char *strptr, *word;
+	MSGTYPE *mtp;
 
 	/*
 	 * MF_SYSLOG is the only supported message facility for the server
@@ -271,8 +271,8 @@ extern char *msgparseopts(msgstr, doset)
 	int doset;
 {
 	static char ebuf[BUFSIZ], msgbuf[MSGBUFSIZ];
-	register char *cp, *optstr;
-	register char *word;
+	char *cp, *optstr;
+	char *word;
 	MSGFACILITY *msgfac;
 
 	if (msgstr == NULL)
@@ -461,7 +461,7 @@ static void msgsendnotify(msgfac, mtype, flags, msgbuf)
 		return;
 
 	if (!msgfac->mf_fptr) {
-		register char *cp;
+		char *cp;
 		int fd;
 		char *getenv();
 
@@ -518,8 +518,8 @@ static void _message(flags, msgbuf)
 	int flags;
 	char *msgbuf;
 {
-	register int i, x;
-	register char *cp;
+	int i, x;
+	char *cp;
 	static char mbuf[2048];
 
 	if (msgbuf && *msgbuf) {
@@ -866,7 +866,7 @@ extern void fatalerr(fmt, a1, a2, a3, a4, a5)
  */
 extern char *getnotifyfile()
 {
-	register int i;
+	int i;
 
 	for (i = 0; msgfacility[i].mf_name; i++)
 		if (msgfacility[i].mf_msgfac == MF_NOTIFY &&
diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c
index ab48f86fb85..1f7666cd4c7 100644
--- a/usr.bin/rdist/rdist.c
+++ b/usr.bin/rdist/rdist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdist.c,v 1.8 2001/07/09 07:04:51 deraadt Exp $	*/
+/*	$OpenBSD: rdist.c,v 1.9 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: rdist.c,v 6.65 1995/12/12 00:20:39 mcooper Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: rdist.c,v 1.8 2001/07/09 07:04:51 deraadt Exp $";
+"$OpenBSD: rdist.c,v 1.9 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)main.c	5.1 (Berkeley) 6/6/85";
@@ -88,7 +88,7 @@ static void addhostlist(name, hostlist)
 	char *name;
 	struct namelist **hostlist;
 {
-	register struct namelist *ptr, *new;
+	struct namelist *ptr, *new;
 
 	if (!name || !hostlist)
 		return;
@@ -112,8 +112,8 @@ main(argc, argv, envp)
 	char **envp;
 {
 	struct namelist *hostlist = NULL;
-	register int x;
-	register char *cp;
+	int x;
+	char *cp;
 	int cmdargs = 0;
 	int c;
 
@@ -397,8 +397,8 @@ docmdargs(nargs, args)
 	int nargs;
 	char *args[];
 {
-	register struct namelist *nl, *prev;
-	register char *cp;
+	struct namelist *nl, *prev;
+	char *cp;
 	struct namelist *files, *hosts;
 	struct subcmd *cmds;
 	char *dest;
@@ -447,10 +447,10 @@ docmdargs(nargs, args)
  * Get a list of NAME blocks (mostly for debugging).
  */
 extern char *getnlstr(nl)
-	register struct namelist *nl;
+	struct namelist *nl;
 {
 	static char buf[16384];
-	register int count = 0, len = 0;
+	int count = 0, len = 0;
 
 	(void) sprintf(buf, "(");
 
diff --git a/usr.bin/rdistd/filesys.c b/usr.bin/rdistd/filesys.c
index 49571c0e5d1..198cb3ffd5c 100644
--- a/usr.bin/rdistd/filesys.c
+++ b/usr.bin/rdistd/filesys.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filesys.c,v 1.6 1999/11/26 21:32:38 millert Exp $	*/
+/*	$OpenBSD: filesys.c,v 1.7 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: filesys.c,v 6.24 1996/01/30 01:57:07 mcooper Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: filesys.c,v 1.6 1999/11/26 21:32:38 millert Exp $";
+"$OpenBSD: filesys.c,v 1.7 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)filesys.c";
@@ -71,7 +71,7 @@ char *find_file(pathname, statbuf, isvalid)
 	static char last_pathname[MAXPATHLEN];
 	static char file[MAXPATHLEN + 3];
 	static struct stat filestat;
-	register char *p;
+	char *p;
 
 	/*
 	 * Mark the statbuf as invalid to start with.
@@ -186,7 +186,7 @@ mntent_t *findmnt(filest, mntinfo)
 	struct stat *filest;
 	struct mntinfo *mntinfo;
 {
-	register struct mntinfo *mi;
+	struct mntinfo *mi;
 
 	for (mi = mntinfo; mi; mi = mi->mi_nxt) {
 		if (mi->mi_mnt->me_flags & MEFLAG_IGNORE)
@@ -205,7 +205,7 @@ int isdupmnt(mnt, mntinfo)
 	mntent_t *mnt;
 	struct mntinfo *mntinfo;
 {
-	register struct mntinfo *m;
+	struct mntinfo *m;
 
 	for (m = mntinfo; m; m = m->mi_nxt)
 		if (strcmp(m->mi_mnt->me_path, mnt->me_path) == 0)
@@ -312,7 +312,7 @@ mntent_t *getmntpt(pathname, statbuf, isvalid)
 	static struct stat filestat;
 	struct stat *pstat;
 	struct mntinfo *tmpmi;
-	register mntent_t *mnt;
+	mntent_t *mnt;
 
 	/*
 	 * Use the supplied stat buffer if not NULL or our own.
diff --git a/usr.bin/rdistd/server.c b/usr.bin/rdistd/server.c
index 9754d949f5d..833cb29108b 100644
--- a/usr.bin/rdistd/server.c
+++ b/usr.bin/rdistd/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.9 2001/09/19 10:58:07 mpech Exp $	*/
+/*	$OpenBSD: server.c,v 1.10 2001/11/19 19:02:15 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -38,7 +38,7 @@ static char RCSid[] =
 "$From: server.c,v 6.85 1996/03/12 22:55:38 mcooper Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: server.c,v 1.9 2001/09/19 10:58:07 mpech Exp $";
+"$OpenBSD: server.c,v 1.10 2001/11/19 19:02:15 mpech Exp $";
 #endif
 
 static char sccsid[] = "@(#)server.c	5.3 (Berkeley) 6/7/86";
@@ -196,7 +196,7 @@ static int fchog(fd, file, owner, group, mode)
 	static UID_T last_uid = (UID_T)-2;
 	static GID_T last_primegid;
 	extern char *locuser;
-	register int i;
+	int i;
 	UID_T uid;
 	GID_T gid;
 	GID_T primegid = (GID_T)-2;
@@ -324,7 +324,7 @@ static int removefile(statb)
 {
 	DIR *d;
 	static DIRENTRY *dp;
-	register char *cp;
+	char *cp;
 	struct stat stb;
 	char *optarget;
 	int len, failures = 0;
@@ -413,10 +413,10 @@ removed:
  * for extraneous files and remove them.
  */
 static void doclean(cp)
-	register char *cp;
+	char *cp;
 {
 	DIR *d;
-	register DIRENTRY *dp;
+	DIRENTRY *dp;
 	struct stat stb;
 	char *optarget, *ep;
 	int len;
@@ -480,7 +480,7 @@ static void doclean(cp)
  * Frontend to doclean().
  */
 static void clean(cp)
-	register char *cp;
+	char *cp;
 {
 	doclean(cp);
 	(void) sendcmd(CC_END, NULL);
@@ -508,7 +508,7 @@ static void dospecial(cmd)
  */
 static void docmdspecial()
 {
-	register char *cp;
+	char *cp;
 	char *cmd, *env = NULL;
 	int n;
 	int len;
@@ -666,7 +666,7 @@ static int chkparent(name, opts)
 	char *name;
 	opt_t opts;
 {
-	register char *cp;
+	char *cp;
 	struct stat stb;
 	int r = -1;
 
@@ -759,7 +759,7 @@ static void recvfile(new, opts, mode, owner, group, mtime, atime, size)
 {
 	int f, wrerr, olderrno, lastwashole = 0, wassparse = 0;
 	off_t i;
-	register char *cp;
+	char *cp;
 	char *savefile = NULL;
 	static struct stat statbuff;
 
@@ -986,7 +986,7 @@ static void recvdir(opts, mode, owner, group)
 	char *owner, *group;
 {
 	static char lowner[100], lgroup[100];
-	register char *cp;
+	char *cp;
 	struct stat stb;
 	int s;
 
@@ -1304,7 +1304,7 @@ static void hardlink(cmd)
 static void setconfig(cmd)
 	char *cmd;
 {
-	register char *cp = cmd;
+	char *cp = cmd;
 	char *estr;
 
 	switch (*cp++) {
@@ -1581,8 +1581,8 @@ extern void cleanup()
 extern void server()
 {
 	static char cmdbuf[BUFSIZ];
-	register char *cp;
-	register int n;
+	char *cp;
+	int n;
 	extern jmp_buf finish_jmpbuf;
 
 	if (setjmp(finish_jmpbuf)) {
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 8ff6b696950..aa5a90991ea 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: renice.c,v 1.6 2001/07/06 21:54:57 pvalchev Exp $	*/
+/*	$OpenBSD: renice.c,v 1.7 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1993
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)renice.c	8.1 (Berkeley) 6/9/93";
 #else
-static char rcsid[] = "$OpenBSD: renice.c,v 1.6 2001/07/06 21:54:57 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: renice.c,v 1.7 2001/11/19 19:02:16 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -101,7 +101,7 @@ main(argc, argv)
 			continue;
 		}
 		if (which == PRIO_USER) {
-			register struct passwd *pwd = getpwnam(*argv);
+			struct passwd *pwd = getpwnam(*argv);
 			
 			if (pwd == NULL) {
 				warnx("%s: unknown user", *argv);
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index 9362944f9dc..2be8b7885a2 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rev.c,v 1.3 1997/01/15 23:43:05 millert Exp $	*/
+/*	$OpenBSD: rev.c,v 1.4 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: rev.c,v 1.5 1995/09/28 08:49:40 tls Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)rev.c	8.3 (Berkeley) 5/4/95";
 #else
-static char rcsid[] = "$OpenBSD: rev.c,v 1.3 1997/01/15 23:43:05 millert Exp $";
+static char rcsid[] = "$OpenBSD: rev.c,v 1.4 2001/11/19 19:02:16 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,7 +64,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register char *filename, *p, *t;
+	char *filename, *p, *t;
 	FILE *fp;
 	size_t len;
 	int ch, rval;
diff --git a/usr.bin/rlogin/des_rw.c b/usr.bin/rlogin/des_rw.c
index 26f7c2c1dda..4515042706e 100644
--- a/usr.bin/rlogin/des_rw.c
+++ b/usr.bin/rlogin/des_rw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: des_rw.c,v 1.8 2001/07/17 02:13:29 pvalchev Exp $	*/
+/*	$OpenBSD: des_rw.c,v 1.9 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: des_rw.c,v 1.2 1995/03/21 07:58:30 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)des_rw.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: des_rw.c,v 1.8 2001/07/17 02:13:29 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: des_rw.c,v 1.9 2001/11/19 19:02:16 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -99,7 +99,7 @@ desrw_clear_key()
 int
 des_read(fd, buf, len)
 	int fd;
-	register char *buf;
+	char *buf;
 	int len;
 {
 	long net_len, rd_len;
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index 07e93050817..c58cb106d12 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlogin.c,v 1.26 2001/11/16 23:57:12 deraadt Exp $	*/
+/*	$OpenBSD: rlogin.c,v 1.27 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: rlogin.c,v 1.8 1995/10/05 09:07:22 mycroft Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: rlogin.c,v 1.26 2001/11/16 23:57:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rlogin.c,v 1.27 2001/11/19 19:02:16 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -529,7 +529,7 @@ catch_child(signo)
 void
 writer()
 {
-	register int bol, local, n;
+	int bol, local, n;
 	char c;
 
 	bol = 1;			/* beginning of line */
@@ -605,13 +605,13 @@ writer()
 
 void
 #ifdef __STDC__
-echo(register char c)
+echo(char c)
 #else
 echo(c)
-	register char c;
+	char c;
 #endif
 {
-	register char *p;
+	char *p;
 	char buf[8];
 
 	p = buf;
@@ -953,7 +953,7 @@ get_window_size(fd, wp)
 
 u_int
 getescape(p)
-	register char *p;
+	char *p;
 {
 	long val;
 	int len;
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index c218c9bd1ee..e901dfb6995 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: rpcinfo.c,v 1.7 2001/07/17 02:24:00 pvalchev Exp $	*/
+/*	$OpenBSD: rpcinfo.c,v 1.8 2001/11/19 19:02:16 mpech Exp $	*/
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/
 /*static char sccsid[] = "from: @(#)rpcinfo.c	2.2 88/08/11 4.0 RPCSRC";*/
-static char rcsid[] = "$OpenBSD: rpcinfo.c,v 1.7 2001/07/17 02:24:00 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: rpcinfo.c,v 1.8 2001/11/19 19:02:16 mpech Exp $";
 #endif
 
 /*
@@ -92,7 +92,7 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register int c;
+	int c;
 	extern char *optarg;
 	extern int optind;
 	int errflg;
@@ -474,7 +474,7 @@ tcpping(portnum, argc, argv)
  */
 int
 pstatus(client, prognum, vers)
-	register CLIENT *client;
+	CLIENT *client;
 	u_long prognum;
 	u_long vers;
 {
@@ -499,11 +499,11 @@ pmapdump(argc, argv)
 	char **argv;
 {
 	struct sockaddr_in server_addr;
-	register struct hostent *hp;
+	struct hostent *hp;
 	struct pmaplist *head = NULL;
 	int socket = RPC_ANYSOCK;
 	struct timeval minutetimeout;
-	register CLIENT *client;
+	CLIENT *client;
 	struct rpcent *rpc;
 	
 	if (argc > 1)
@@ -569,7 +569,7 @@ reply_proc(res, who)
 	caddr_t res;			/* Nothing comes back */
 	struct sockaddr_in *who;	/* Who sent us the reply */
 {
-	register struct hostent *hp;
+	struct hostent *hp;
 
 	hp = gethostbyaddr((char *) &who->sin_addr, sizeof who->sin_addr,
 	    AF_INET);
@@ -674,7 +674,7 @@ getprognum(arg, ulp)
 	char *arg;
 	u_long *ulp;
 {
-	register struct rpcent *rpc;
+	struct rpcent *rpc;
 
 	if (isalpha(*arg)) {
 		rpc = getrpcbyname(arg);
@@ -717,7 +717,7 @@ get_inet_address(addr, host)
 	struct sockaddr_in *addr;
 	char *host;
 {
-	register struct hostent *hp;
+	struct hostent *hp;
 
 	bzero((char *)addr, sizeof *addr);
 	if (inet_aton(host, &addr->sin_addr) == 0) {
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index 035a5203709..a0453ff00e7 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rs.c,v 1.5 2001/10/28 03:56:46 deraadt Exp $	*/
+/*	$OpenBSD: rs.c,v 1.6 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -127,9 +127,9 @@ main(argc, argv)
 void
 getfile()
 {
-	register char *p;
-	register char *endp;
-	register char **ep = 0;
+	char *p;
+	char *endp;
+	char **ep = 0;
 	int multisep = (flags & ONEISEPONLY ? 0 : 1);
 	int nullpad = flags & NULLPAD;
 	char **padto;
@@ -193,8 +193,8 @@ getfile()
 void
 putfile()
 {
-	register char **ep;
-	register int i, j, n;
+	char **ep;
+	int i, j, n;
 
 	ep = elem;
 	if (flags & TRANSPOSE) {
@@ -220,8 +220,8 @@ prints(s, col)
 	char *s;
 	int col;
 {
-	register int n;
-	register char *p = s;
+	int n;
+	char *p = s;
 
 	while (*p)
 		p++;
@@ -248,9 +248,9 @@ usage(msg, s)
 void
 prepfile()
 {
-	register char **ep;
-	register int  i;
-	register int  j;
+	char **ep;
+	int  i;
+	int  j;
 	char **lp;
 	int colw;
 	int max = 0;
@@ -343,8 +343,8 @@ getline()	/* get line; maintain curline, curlen; manage storage */
 {
 	static	int putlength;
 	static	char *endblock = ibuf + BSIZE;
-	register char *p;
-	register int c, i;
+	char *p;
+	int c, i;
 
 	if (!irows) {
 		curline = ibuf;
@@ -375,7 +375,7 @@ char **
 getptrs(sp)
 	char **sp;
 {
-	register char **p;
+	char **p;
 
 	allocsize += allocsize;
 	p = (char **)realloc(elem, allocsize * sizeof(char *));
@@ -392,7 +392,7 @@ getargs(ac, av)
 	int ac;
 	char *av[];
 {
-	register char *p;
+	char *p;
 
 	if (ac == 1) {
 		flags |= NOARGS | TRANSPOSE;
@@ -503,8 +503,8 @@ getlist(list, p)
 	short **list;
 	char *p;
 {
-	register int count = 1;
-	register char *t;
+	int count = 1;
+	char *t;
 
 	for (t = p + 1; *t; t++) {
 		if (!isdigit(*t))
@@ -536,7 +536,7 @@ getnum(num, p, strict)	/* num = number p points to; if (strict) complain */
 	int *num, strict;	/* returns pointer to end of num */
 	char *p;
 {
-	register char *t = p;
+	char *t = p;
 
 	if (!isdigit(*++t)) {
 		if (strict || *t == '-' || *t == '+')
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index bc4fa9e7826..343d8d47057 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rsh.c,v 1.21 2001/09/27 16:24:45 deraadt Exp $	*/
+/*	$OpenBSD: rsh.c,v 1.22 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1990 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rsh.c	5.24 (Berkeley) 7/1/91";*/
-static char rcsid[] = "$OpenBSD: rsh.c,v 1.21 2001/09/27 16:24:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rsh.c,v 1.22 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -87,7 +87,7 @@ int krcmd_mutual __P((char **, u_short, char *, char *, int *, char *,
 
 void usage __P((void));
 
-void talk __P((int, sigset_t *, int, register int));
+void talk __P((int, sigset_t *, int, int));
 
 /*
  * rsh - remote shell
@@ -105,7 +105,7 @@ main(argc, argv)
 	struct servent *sp;
 	sigset_t mask, omask;
 	int argoff, asrsh, ch, dflag, nflag, one, pid = 0, rem, uid;
-	register char *p;
+	char *p;
 	char *args, *host, *user, *copyargs();
 	void sendsig();
 
@@ -333,10 +333,10 @@ void
 talk(nflag, omask, pid, rem)
 	int nflag, pid;
 	sigset_t *omask;
-	register int rem;
+	int rem;
 {
-	register int cc, wc;
-	register char *bp;
+	int cc, wc;
+	char *bp;
 	fd_set readfrom, ready, rembits;
 	char buf[BUFSIZ];
 
@@ -476,8 +476,8 @@ char *
 copyargs(argv)
 	char **argv;
 {
-	register int cc;
-	register char **ap, *p;
+	int cc;
+	char **ap, *p;
 	char *args, *malloc();
 
 	cc = 0;
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 922a7c49d76..202c079e639 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ruptime.c,v 1.5 1997/07/06 02:28:55 millert Exp $	*/
+/*	$OpenBSD: ruptime.c,v 1.6 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)ruptime.c	5.8 (Berkeley) 7/21/90";*/
-static char rcsid[] = "$OpenBSD: ruptime.c,v 1.5 1997/07/06 02:28:55 millert Exp $";
+static char rcsid[] = "$OpenBSD: ruptime.c,v 1.6 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -77,10 +77,10 @@ main(argc, argv)
 {
 	extern char *optarg;
 	extern int optind;
-	register struct hs *hsp;
-	register struct whod *wd;
-	register struct whoent *we;
-	register DIR *dirp;
+	struct hs *hsp;
+	struct whod *wd;
+	struct whoent *we;
+	DIR *dirp;
 	struct dirent *dp;
 	int aflg, cc, ch, f, i, maxloadav;
 	char buf[sizeof(struct whod)];
@@ -220,7 +220,7 @@ int
 lcmp(a1, a2)
 	void *a1, *a2;
 {
-	register struct hs *h1 = a1, *h2 = a2;
+	struct hs *h1 = a1, *h2 = a2;
 
 	if (ISDOWN(h1))
 		if (ISDOWN(h2))
@@ -239,7 +239,7 @@ int
 ucmp(a1, a2)
 	void *a1, *a2;
 {
-	register struct hs *h1 = a1, *h2 = a2;
+	struct hs *h1 = a1, *h2 = a2;
 
 	if (ISDOWN(h1))
 		if (ISDOWN(h2))
@@ -257,7 +257,7 @@ int
 tcmp(a1, a2)
 	void *a1, *a2;
 {
-	register struct hs *h1 = a1, *h2 = a2;
+	struct hs *h1 = a1, *h2 = a2;
 
 	return(rflg * (
 		(ISDOWN(h2) ? h2->hs_wd->wd_recvtime - now
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 67ecc5628c9..ca9308d591e 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compile.c,v 1.9 1998/09/24 03:00:59 millert Exp $	*/
+/*	$OpenBSD: compile.c,v 1.10 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1992 Diomidis Spinellis.
@@ -39,7 +39,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)compile.c	8.2 (Berkeley) 4/28/95"; */
-static char *rcsid = "$OpenBSD: compile.c,v 1.9 1998/09/24 03:00:59 millert Exp $";
+static char *rcsid = "$OpenBSD: compile.c,v 1.10 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -151,7 +151,7 @@ static struct s_command **
 compile_stream(link)
 	struct s_command **link;
 {
-	register char *p;
+	char *p;
 	static char lbuf[_POSIX2_LINE_MAX + 1];	/* To save stack */
 	struct s_command *cmd, *cmd2, *stack;
 	struct s_format *fp;
@@ -691,7 +691,7 @@ compile_addr(p, a)
  */
 static char *
 duptoeol(s, ctype)
-	register char *s;
+	char *s;
 	char *ctype;
 {
 	size_t len;
@@ -751,9 +751,9 @@ static void
 enterlabel(cp)
 	struct s_command *cp;
 {
-	register struct labhash **lhp, *lh;
-	register u_char *p;
-	register u_int h, c;
+	struct labhash **lhp, *lh;
+	u_char *p;
+	u_int h, c;
 
 	for (h = 0, p = (u_char *)cp->t; (c = *p) != 0; p++)
 		h = (h << 5) + h + c;
@@ -777,9 +777,9 @@ static struct s_command *
 findlabel(name)
 	char *name;
 {
-	register struct labhash *lh;
-	register u_char *p;
-	register u_int h, c;
+	struct labhash *lh;
+	u_char *p;
+	u_int h, c;
 
 	for (h = 0, p = (u_char *)name; (c = *p) != 0; p++)
 		h = (h << 5) + h + c;
@@ -799,8 +799,8 @@ findlabel(name)
 static void
 uselabel()
 {
-	register struct labhash *lh, *next;
-	register int i;
+	struct labhash *lh, *next;
+	int i;
 
 	for (i = 0; i < LHSZ; i++) {
 		for (lh = labels[i]; lh != NULL; lh = next) {
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 8988b48acf6..145ea13eeb0 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.c,v 1.5 1999/06/06 15:42:24 deraadt Exp $	*/
+/*	$OpenBSD: process.c,v 1.6 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1992 Diomidis Spinellis.
@@ -39,7 +39,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)process.c	8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: process.c,v 1.5 1999/06/06 15:42:24 deraadt Exp $";
+static char *rcsid = "$OpenBSD: process.c,v 1.6 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -459,10 +459,10 @@ flush_appends()
 
 static void
 lputs(s)
-	register char *s;
+	char *s;
 {
-	register int count;
-	register char *escapes, *p;
+	int count;
+	char *escapes, *p;
 	struct winsize win;
 	static int termwidth = -1;
 
@@ -543,8 +543,8 @@ regsub(sp, string, src)
 	SPACE *sp;
 	char *string, *src;
 {
-	register int len, no;
-	register char c, *dst;
+	int len, no;
+	char c, *dst;
 
 #define	NEEDSP(reqlen)							\
 	if (sp->len >= sp->blen - (reqlen) - 1) {			\
@@ -613,7 +613,7 @@ cspace(sp, p, len, spflag)
  */
 void
 cfclose(cp, end)
-	register struct s_command *cp, *end;
+	struct s_command *cp, *end;
 {
 
 	for (; cp != end; cp = cp->next)
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index af2e35d459e..236fa5f6b2d 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: soelim.c,v 1.3 1997/09/11 11:21:53 deraadt Exp $	*/
+/*	$OpenBSD: soelim.c,v 1.4 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: soelim.c,v 1.3 1994/12/21 08:11:26 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)soelim.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: soelim.c,v 1.3 1997/09/11 11:21:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: soelim.c,v 1.4 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -91,8 +91,8 @@ main(argc, argv)
 int process(file)
 	char *file;
 {
-	register char *cp;
-	register int c;
+	char *cp;
+	int c;
 	char fname[BUFSIZ];
 	FILE *soee;
 	int isfile;
diff --git a/usr.bin/ssh/deattack.c b/usr.bin/ssh/deattack.c
index 1a89be4b803..44220491d8c 100644
--- a/usr.bin/ssh/deattack.c
+++ b/usr.bin/ssh/deattack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: deattack.c,v 1.14 2001/06/23 15:12:18 itojun Exp $	*/
+/*	$OpenBSD: deattack.c,v 1.15 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*
  * Cryptographic attack detector for ssh - source code
@@ -85,9 +85,9 @@ detect_attack(u_char *buf, u_int32_t len, u_char *IV)
 {
 	static u_int16_t *h = (u_int16_t *) NULL;
 	static u_int32_t n = HASH_MINSIZE / HASH_ENTRYSIZE;
-	register u_int32_t i, j;
+	u_int32_t i, j;
 	u_int32_t l;
-	register u_char *c;
+	u_char *c;
 	u_char *d;
 
 	if (len > (SSH_MAXBLOCKS * SSH_BLOCKSIZE) ||
diff --git a/usr.bin/ssh/radix.c b/usr.bin/ssh/radix.c
index 26b1ebe52f0..e60435736e5 100644
--- a/usr.bin/ssh/radix.c
+++ b/usr.bin/ssh/radix.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "uuencode.h"
 
-RCSID("$OpenBSD: radix.c,v 1.16 2001/06/23 15:12:19 itojun Exp $");
+RCSID("$OpenBSD: radix.c,v 1.17 2001/11/19 19:02:16 mpech Exp $");
 
 #ifdef AFS
 #include <krb.h>
@@ -39,7 +39,7 @@ typedef u_short my_u_short;
 /* Nasty macros from BIND-4.9.2 */
 
 #define GETSHORT(s, cp) { \
-	register my_u_char *t_cp = (my_u_char *)(cp); \
+	my_u_char *t_cp = (my_u_char *)(cp); \
 	(s) = (((my_u_short)t_cp[0]) << 8) \
 	    | (((my_u_short)t_cp[1])) \
 	    ; \
@@ -47,7 +47,7 @@ typedef u_short my_u_short;
 }
 
 #define GETLONG(l, cp) { \
-	register my_u_char *t_cp = (my_u_char *)(cp); \
+	my_u_char *t_cp = (my_u_char *)(cp); \
 	(l) = (((my_u_int32_t)t_cp[0]) << 24) \
 	    | (((my_u_int32_t)t_cp[1]) << 16) \
 	    | (((my_u_int32_t)t_cp[2]) << 8) \
@@ -57,16 +57,16 @@ typedef u_short my_u_short;
 }
 
 #define PUTSHORT(s, cp) { \
-	register my_u_short t_s = (my_u_short)(s); \
-	register my_u_char *t_cp = (my_u_char *)(cp); \
+	my_u_short t_s = (my_u_short)(s); \
+	my_u_char *t_cp = (my_u_char *)(cp); \
 	*t_cp++ = t_s >> 8; \
 	*t_cp   = t_s; \
 	(cp) += 2; \
 }
 
 #define PUTLONG(l, cp) { \
-	register my_u_int32_t t_l = (my_u_int32_t)(l); \
-	register my_u_char *t_cp = (my_u_char *)(cp); \
+	my_u_int32_t t_l = (my_u_int32_t)(l); \
+	my_u_char *t_cp = (my_u_char *)(cp); \
 	*t_cp++ = t_l >> 24; \
 	*t_cp++ = t_l >> 16; \
 	*t_cp++ = t_l >> 8; \
@@ -75,9 +75,9 @@ typedef u_short my_u_short;
 }
 
 #define GETSTRING(s, p, p_l) {			\
-    register char *p_targ = (p) + p_l;		\
-    register char *s_c = (s);			\
-    register char *p_c = (p);			\
+    char *p_targ = (p) + p_l;		\
+    char *s_c = (s);			\
+    char *p_c = (p);			\
     while (*p_c && (p_c < p_targ)) {		\
 	*s_c++ = *p_c++;			\
     }						\
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index 992ee946fa7..63352cf992e 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strings.c,v 1.5 2000/02/23 19:44:08 provos Exp $	*/
+/*	$OpenBSD: strings.c,v 1.6 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: strings.c,v 1.7 1995/02/15 15:49:19 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)strings.c	8.2 (Berkeley) 1/28/94";
 #endif
-static char rcsid[] = "$OpenBSD: strings.c,v 1.5 2000/02/23 19:44:08 provos Exp $";
+static char rcsid[] = "$OpenBSD: strings.c,v 1.6 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -84,8 +84,8 @@ main(argc, argv)
 {
 	extern char *optarg;
 	extern int optind;
-	register int ch, cnt;
-	register u_char *C;
+	int ch, cnt;
+	u_char *C;
 	EXEC *head;
 	int exitcode, minlen, maxlen, bfrlen;
 	short asdata, fflg;
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index fa1263ff8d3..56b218abbc0 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strip.c,v 1.14 2001/07/18 17:17:39 pvalchev Exp $	*/
+/*	$OpenBSD: strip.c,v 1.15 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*
  * Copyright (c) 1988 Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)strip.c	5.8 (Berkeley) 11/6/91";*/
-static char rcsid[] = "$OpenBSD: strip.c,v 1.14 2001/07/18 17:17:39 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: strip.c,v 1.15 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -80,7 +80,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register int fd;
+	int fd;
 	EXEC *ep;
 	struct stat sb;
 	int (*sfcn)__P((const char *, int, EXEC *, struct stat *));
@@ -146,12 +146,12 @@ int
 s_sym(fn, fd, ep, sp)
 	const char *fn;
 	int fd;
-	register EXEC *ep;
+	EXEC *ep;
 	struct stat *sp;
 {
-	register char *neweof;
+	char *neweof;
 #if	0
-	register char *mineof;
+	char *mineof;
 #endif
 	int zmagic;
 
@@ -218,9 +218,9 @@ s_stab(fn, fd, ep, sp)
 	EXEC *ep;
 	struct stat *sp;
 {
-	register int cnt, len;
-	register char *nstr, *nstrbase, *p, *strbase;
-	register NLIST *sym, *nsym;
+	int cnt, len;
+	char *nstr, *nstrbase, *p, *strbase;
+	NLIST *sym, *nsym;
 	u_long allocsize;
 	int mid;
 	NLIST *symbase;
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index f27ffa4bf35..8845beee7d1 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.6 2001/09/04 23:35:59 millert Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.7 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: cmds.c,v 1.4 1996/05/10 23:16:32 thorpej Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/29/95";
 #endif
-static char rcsid[] = "$OpenBSD: cmds.c,v 1.6 2001/09/04 23:35:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.7 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
@@ -53,8 +53,8 @@ void
 command(cmd)
         char *cmd;
 {
-        register struct cmdtab *p;
-        register char *cp;
+        struct cmdtab *p;
+        char *cp;
 	int interval;
 	sigset_t mask, omask;
 
@@ -152,11 +152,11 @@ done:
 
 struct cmdtab *
 lookup(name)
-	register char *name;
+	char *name;
 {
-	register char *p, *q;
-	register struct cmdtab *c, *found;
-	register int nmatches, longest;
+	char *p, *q;
+	struct cmdtab *c, *found;
+	int nmatches, longest;
 
 	longest = 0;
 	nmatches = 0;
@@ -189,7 +189,7 @@ status()
 
 int
 prefix(s1, s2)
-        register char *s1, *s2;
+        char *s1, *s2;
 {
 
         while (*s1 == *s2) {
diff --git a/usr.bin/systat/disks.c b/usr.bin/systat/disks.c
index bc9509aeed2..daf2b7a4d88 100644
--- a/usr.bin/systat/disks.c
+++ b/usr.bin/systat/disks.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disks.c,v 1.8 1997/06/23 22:21:46 millert Exp $	*/
+/*	$OpenBSD: disks.c,v 1.9 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: disks.c,v 1.4 1996/05/10 23:16:33 thorpej Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)disks.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: disks.c,v 1.8 1997/06/23 22:21:46 millert Exp $";
+static char rcsid[] = "$OpenBSD: disks.c,v 1.9 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <string.h>
@@ -61,7 +61,7 @@ dkcmd(cmd, args)
 		return (1);
 	}
 	if (prefix(cmd, "drives")) {
-		register int i;
+		int i;
 
 		move(CMDLINE, 0); clrtoeol();
 		for (i = 0; i < dk_ndrive; i++)
@@ -76,8 +76,8 @@ dkselect(args, truefalse, selections)
 	char *args;
 	int truefalse, selections[];
 {
-	register char *cp;
-	register int i;
+	char *cp;
+	int i;
 
 	cp = strchr(args, '\n');
 	if (cp)
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 454860cfa48..44d130f35fb 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iostat.c,v 1.12 2001/08/12 12:03:03 heko Exp $	*/
+/*	$OpenBSD: iostat.c,v 1.13 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: iostat.c,v 1.5 1996/05/10 23:16:35 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: iostat.c,v 1.12 2001/08/12 12:03:03 heko Exp $";
+static char rcsid[] = "$OpenBSD: iostat.c,v 1.13 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -195,7 +195,7 @@ barlabels(row)
 void
 showiostat()
 {
-	register int i, row, col;
+	int i, row, col;
 
 	dkswap();
 
@@ -280,7 +280,7 @@ static void
 stat1(row, o)
 	int row, o;
 {
-	register int i;
+	int i;
 	double time;
 
 	time = 0;
@@ -300,8 +300,8 @@ histogram(val, colwidth, scale)
 	double scale;
 {
 	char buf[10];
-	register int k;
-	register int v = (int)(val * scale) + 0.5;
+	int k;
+	int v = (int)(val * scale) + 0.5;
 
 	k = MIN(v, colwidth);
 	if (v > colwidth) {
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 004cc253236..36af36a0514 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.16 2001/09/04 23:35:59 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.17 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: main.c,v 1.8 1996/05/10 23:16:36 thorpej Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: main.c,v 1.16 2001/09/04 23:35:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.17 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -230,7 +230,7 @@ void
 display(signo)
 	int signo;
 {
-	register int i, j;
+	int i, j;
 
 	/* Get the load average over the last minute. */
 	(void) getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0]));
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 397b3f7f7cd..60616a682e3 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbufs.c,v 1.5 2001/05/04 16:48:34 ericj Exp $	*/
+/*	$OpenBSD: mbufs.c,v 1.6 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: mbufs.c,v 1.2 1995/01/20 08:52:02 jtc Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: mbufs.c,v 1.5 2001/05/04 16:48:34 ericj Exp $";
+static char rcsid[] = "$OpenBSD: mbufs.c,v 1.6 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -101,7 +101,7 @@ labelmbufs()
 void
 showmbufs()
 {
-	register int i, j, max, index;
+	int i, j, max, index;
 	char buf[13];
 
 	if (mb == 0)
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 5d9f433e721..dcf64cafaea 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netcmds.c,v 1.5 2000/01/05 11:04:22 itojun Exp $	*/
+/*	$OpenBSD: netcmds.c,v 1.6 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: netcmds.c,v 1.4 1995/05/21 17:14:38 mycroft Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)netcmds.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: netcmds.c,v 1.5 2000/01/05 11:04:22 itojun Exp $";
+static char rcsid[] = "$OpenBSD: netcmds.c,v 1.6 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -129,7 +129,7 @@ changeitems(args, onoff)
 	char *args;
 	int onoff;
 {
-	register char *cp;
+	char *cp;
 	struct servent *sp;
 	struct addrinfo hints, *res0, *res;
 
@@ -203,7 +203,7 @@ selectport(port, onoff)
 	long port;
 	int onoff;
 {
-	register struct pitem *p;
+	struct pitem *p;
 
 	if (port == -1) {
 		if (ports == 0)
@@ -229,9 +229,9 @@ selectport(port, onoff)
 
 int
 checkport(inp)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 {
-	register struct pitem *p;
+	struct pitem *p;
 
 	if (ports)
 	for (p = ports; p < ports+nports; p++)
@@ -243,7 +243,7 @@ checkport(inp)
 static void
 showports()
 {
-	register struct pitem *p;
+	struct pitem *p;
 	struct servent *sp;
 
 	for (p = ports; p < ports+nports; p++) {
@@ -293,7 +293,7 @@ selecthost(sa, onoff)
 	struct sockaddr *sa;
 	int onoff;
 {
-	register struct hitem *p;
+	struct hitem *p;
 
 	if (sa == 0) {
 		if (hosts == 0)
@@ -321,9 +321,9 @@ selecthost(sa, onoff)
 
 int
 checkhost(inp)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 {
-	register struct hitem *p;
+	struct hitem *p;
 
 	if (hosts)
 	for (p = hosts; p < hosts+nhosts; p++) {
@@ -352,7 +352,7 @@ checkhost(inp)
 static void
 showhosts()
 {
-	register struct hitem *p;
+	struct hitem *p;
 	char hbuf[NI_MAXHOST];
 	struct sockaddr *sa;
 	int flags;
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index d758bb8ef99..a0fa994cbb0 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netstat.c,v 1.16 2001/07/28 05:36:18 pvalchev Exp $	*/
+/*	$OpenBSD: netstat.c,v 1.17 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: netstat.c,v 1.16 2001/07/28 05:36:18 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: netstat.c,v 1.17 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -134,7 +134,7 @@ void
 closenetstat(w)
         WINDOW *w;
 {
-	register struct netinfo *p;
+	struct netinfo *p;
 
 	endhostent();
 	endnetent();
@@ -182,8 +182,8 @@ void
 fetchnetstat()
 {
 	struct inpcbtable pcbtable;
-	register struct inpcb *head, *prev, *next;
-	register struct netinfo *p;
+	struct inpcb *head, *prev, *next;
+	struct netinfo *p;
 	struct inpcb inpcb;
 	struct socket sockb;
 	struct tcpcb tcpcb;
@@ -258,12 +258,12 @@ printf("prev = %p, head = %p, next = %p, inpcb...prev = %p\n", prev, head, next,
 
 static void
 enter(inp, so, state, proto)
-	register struct inpcb *inp;
-	register struct socket *so;
+	struct inpcb *inp;
+	struct socket *so;
 	int state;
 	char *proto;
 {
-	register struct netinfo *p;
+	struct netinfo *p;
 
 	/*
 	 * Only take exact matches, any sockets with
@@ -363,7 +363,7 @@ labelnetstat()
 void
 shownetstat()
 {
-	register struct netinfo *p, *q;
+	struct netinfo *p, *q;
 
 	/*
 	 * First, delete any connections that have gone
@@ -464,7 +464,7 @@ shownetstat()
  */
 static void
 inetprint(in, port, proto)
-	register struct in_addr *in;
+	struct in_addr *in;
 	int port;
 	char *proto;
 {
@@ -492,7 +492,7 @@ inetprint(in, port, proto)
 #ifdef INET6
 static void
 inet6print(in6, port, proto)
-	register struct in6_addr *in6;
+	struct in6_addr *in6;
 	int port;
 	char *proto;
 {
@@ -590,7 +590,7 @@ int
 cmdnetstat(cmd, args)
 	char *cmd, *args;
 {
-	register struct netinfo *p;
+	struct netinfo *p;
 
 	if (prefix(cmd, "all")) {
 		aflag = !aflag;
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 5de9325f36b..543f9171606 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pigs.c,v 1.8 2001/07/28 05:36:18 pvalchev Exp $	*/
+/*	$OpenBSD: pigs.c,v 1.9 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: pigs.c,v 1.3 1995/04/29 05:54:50 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pigs.c	8.2 (Berkeley) 9/23/93";
 #endif
-static char rcsid[] = "$OpenBSD: pigs.c,v 1.8 2001/07/28 05:36:18 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: pigs.c,v 1.9 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -96,7 +96,7 @@ closepigs(w)
 void
 showpigs()
 {
-	register int i, j, y, k;
+	int i, j, y, k;
 	struct	eproc *ep;
 	float total;
 	int factor;
@@ -181,10 +181,10 @@ initpigs()
 void
 fetchpigs()
 {
-	register int i;
-	register float time;
-	register struct proc *pp;
-	register float *pctp;
+	int i;
+	float time;
+	struct proc *pp;
+	float *pctp;
 	struct kinfo_proc *kpp;
 	long ctime[CPUSTATES];
 	double t;
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index e74d818da25..89288d9eb08 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmstat.c,v 1.27 2001/11/18 23:56:49 deraadt Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.28 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
-static char rcsid[] = "$OpenBSD: vmstat.c,v 1.27 2001/11/18 23:56:49 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vmstat.c,v 1.28 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -305,7 +305,7 @@ fetchkre()
 void
 labelkre()
 {
-	register int i, j;
+	int i, j;
 
 	clear();
 	mvprintw(STATROW, STATCOL + 4, "users    Load");
@@ -577,7 +577,7 @@ cmdkre(cmd, args)
 static int
 ucount()
 {
-	register int nusers = 0;
+	int nusers = 0;
 
 	if (ut < 0)
 		return (0);
@@ -594,7 +594,7 @@ cputime(indx)
 	int indx;
 {
 	double t;
-	register int i;
+	int i;
 
 	t = 0;
 	for (i = 0; i < CPUSTATES; i++)
@@ -698,7 +698,7 @@ allocinfo(s)
 
 static void
 copyinfo(from, to)
-	register struct Info *from, *to;
+	struct Info *from, *to;
 {
 	long *intrcnt;
 
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index 994fcd07baf..f7d1d248bf7 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: forward.c,v 1.12 2001/08/18 14:49:15 art Exp $	*/
+/*	$OpenBSD: forward.c,v 1.13 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: forward.c,v 1.7 1996/02/13 16:49:10 ghudson Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)forward.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: forward.c,v 1.12 2001/08/18 14:49:15 art Exp $";
+static char rcsid[] = "$OpenBSD: forward.c,v 1.13 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -258,8 +258,8 @@ rlines(fp, off, sbp)
 	long off;
 	struct stat *sbp;
 {
-	register off_t size;
-	register char *p;
+	off_t size;
+	char *p;
 	char *start;
 
 	if (!(size = sbp->st_size))
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index 1b4d8d7a63c..8b8c7b0b56d 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: read.c,v 1.5 2001/09/19 10:58:07 mpech Exp $	*/
+/*	$OpenBSD: read.c,v 1.6 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: read.c,v 1.4 1994/11/23 07:42:07 jtc Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: read.c,v 1.5 2001/09/19 10:58:07 mpech Exp $";
+static char rcsid[] = "$OpenBSD: read.c,v 1.6 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -72,11 +72,11 @@ static char rcsid[] = "$OpenBSD: read.c,v 1.5 2001/09/19 10:58:07 mpech Exp $";
  */
 int
 bytes(fp, off)
-	register FILE *fp;
+	FILE *fp;
 	off_t off;
 {
-	register int ch, len, tlen;
-	register char *ep, *p, *t;
+	int ch, len, tlen;
+	char *ep, *p, *t;
 	int wrap;
 	char *sp;
 
@@ -143,7 +143,7 @@ bytes(fp, off)
  */
 int
 lines(fp, off)
-	register FILE *fp;
+	FILE *fp;
 	off_t off;
 {
 	struct {
@@ -151,8 +151,8 @@ lines(fp, off)
 		u_int len;
 		char *l;
 	} *lines;
-	register int ch;
-	register char *p = NULL;
+	int ch;
+	char *p = NULL;
 	int blen, cnt, recno, wrap;
 	char *sp = NULL;
 
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index e3821f2b0ce..3a03bbc0073 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reverse.c,v 1.10 2001/07/17 02:23:58 pvalchev Exp $	*/
+/*	$OpenBSD: reverse.c,v 1.11 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: reverse.c,v 1.6 1994/11/23 07:42:10 jtc Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)reverse.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: reverse.c,v 1.10 2001/07/17 02:23:58 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: reverse.c,v 1.11 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -111,13 +111,13 @@ reverse(fp, style, off, sbp)
 static int
 r_reg(fp, style, off, sbp)
 	FILE *fp;
-	register enum STYLE style;
+	enum STYLE style;
 	long off;
 	struct stat *sbp;
 {
-	register off_t size;
-	register int llen;
-	register char *p;
+	off_t size;
+	int llen;
+	char *p;
 	char *start;
 
 	if (!(size = sbp->st_size))
@@ -173,9 +173,9 @@ static void
 r_buf(fp)
 	FILE *fp;
 {
-	register BF *mark, *tr, *tl = NULL;
-	register int ch, len, llen;
-	register char *p;
+	BF *mark, *tr, *tl = NULL;
+	int ch, len, llen;
+	char *p;
 	off_t enomem;
 
 #define	BSZ	(128 * 1024)
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 8531fca1063..dd26ca4d7e7 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tail.c,v 1.6 2000/11/21 22:01:48 art Exp $	*/
+/*	$OpenBSD: tail.c,v 1.7 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -46,7 +46,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)tail.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: tail.c,v 1.6 2000/11/21 22:01:48 art Exp $";
+static char rcsid[] = "$OpenBSD: tail.c,v 1.7 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -225,7 +225,7 @@ static void
 obsolete(argv)
 	char *argv[];
 {
-	register char *ap, *p, *t;
+	char *ap, *p, *t;
 	int len;
 	char *start;
 
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 0276eb104a5..4e7d6875fd5 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: display.c,v 1.8 2000/12/31 00:24:51 hugh Exp $	*/
+/*	$OpenBSD: display.c,v 1.9 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: display.c,v 1.3 1994/12/09 02:14:13 jtc Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: display.c,v 1.8 2000/12/31 00:24:51 hugh Exp $";
+static char rcsid[] = "$OpenBSD: display.c,v 1.9 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -73,11 +73,11 @@ max(a,b)
  */
 void
 display(win, text, size)
-	register xwin_t *win;
-	register char *text;
+	xwin_t *win;
+	char *text;
 	int size;
 {
-	register int i;
+	int i;
 	char cch;
 
 	for (i = 0; i < size; i++) {
@@ -175,7 +175,7 @@ readwin(win, line, col)
 	int line, col;
 {
 	int oldline, oldcol;
-	register int c;
+	int c;
 
 	getyx(win, oldline, oldcol);
 	wmove(win, line, col);
@@ -190,7 +190,7 @@ readwin(win, line, col)
  */
 void
 xscroll(win, flag)
-	register xwin_t *win;
+	xwin_t *win;
 	int flag;
 {
 
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 3c6c7ee3303..63e9e6c335a 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get_names.c,v 1.8 2001/03/09 03:19:52 deraadt Exp $	*/
+/*	$OpenBSD: get_names.c,v 1.9 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: get_names.c,v 1.4 1994/12/09 02:14:16 jtc Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: get_names.c,v 1.8 2001/03/09 03:19:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: get_names.c,v 1.9 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include "talk.h"
@@ -60,7 +60,7 @@ get_names(argc, argv)
 	char *his_name, *my_name;
 	char *my_machine_name, *his_machine_name;
 	char *his_tty;
-	register char *cp;
+	char *cp;
 	char *names;
 
 	if (argc > 1 && !strcmp(argv[1], "-H")) {
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 7d1ff049bdb..c5b7818e7f5 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tee.c,v 1.2 1996/06/26 05:40:32 deraadt Exp $	*/
+/*	$OpenBSD: tee.c,v 1.3 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: tee.c,v 1.5 1994/12/09 01:43:39 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)tee.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: tee.c,v 1.2 1996/06/26 05:40:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tee.c,v 1.3 2001/11/19 19:02:16 mpech Exp $";
 #endif
 
 #include <sys/types.h>
@@ -73,9 +73,9 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register LIST *p;
-	register int n, fd, rval, wval;
-	register char *bp;
+	LIST *p;
+	int n, fd, rval, wval;
+	char *bp;
 	int append, ch, exitval;
 	char *buf;
 #define	BSIZE (8 * 1024)
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index 09d1c6a2539..523e9481c82 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: commands.c,v 1.38 2001/09/03 05:28:51 itojun Exp $	*/
+/*	$OpenBSD: commands.c,v 1.39 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
 
 /*
@@ -95,8 +95,8 @@ skey_calc(argc, argv)
     static void
 makeargv()
 {
-    register char *cp, *cp2, c;
-    register char **argp = margv;
+    char *cp, *cp2, c;
+    char **argp = margv;
 
     margc = 0;
     cp = line;
@@ -107,7 +107,7 @@ makeargv()
 	cp++;
     }
     while ((c = *cp)) {
-	register int inquote = 0;
+	int inquote = 0;
 	while (isspace(c))
 	    c = *++cp;
 	if (c == '\0')
@@ -151,9 +151,9 @@ makeargv()
 
 	static char
 special(s)
-	register char *s;
+	char *s;
 {
-	register char c;
+	char c;
 	char b;
 
 	switch (*s) {
@@ -178,7 +178,7 @@ special(s)
  */
 	static char *
 control(c)
-	register cc_t c;
+	cc_t c;
 {
 	static char buf[5];
 	/*
@@ -188,7 +188,7 @@ control(c)
 	 * was to assign "c" to an unsigned int variable...
 	 * Arggg....
 	 */
-	register unsigned int uic = (unsigned int)c;
+	unsigned int uic = (unsigned int)c;
 
 	if (uic == 0x7f)
 		return ("^?");
@@ -397,10 +397,10 @@ send_tncmd(func, cmd, name)
 {
     char **cpp;
     extern char *telopts[];
-    register int val = 0;
+    int val = 0;
 
     if (isprefix(name, "help") || isprefix(name, "?")) {
-	register int col, len;
+	int col, len;
 
 	printf("Usage: send %s <value|option>\r\n", cmd);
 	printf("\"value\" must be from 0 to 255\r\n");
@@ -428,7 +428,7 @@ send_tncmd(func, cmd, name)
     if (cpp) {
 	val = cpp - telopts;
     } else {
-	register char *cp = name;
+	char *cp = name;
 
 	while (*cp >= '0' && *cp <= '9') {
 	    val *= 10;
@@ -988,7 +988,7 @@ unsetcmd(argc, argv)
 {
     struct setlist *ct;
     struct togglelist *c;
-    register char *name;
+    char *name;
 
     if (argc < 2) {
 	fprintf(stderr,
@@ -1287,7 +1287,7 @@ setescape(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register char *arg;
+	char *arg;
 	char buf[50];
 
 	printf(
@@ -1372,7 +1372,7 @@ shell(argc, argv)
 	    /*
 	     * Fire up the shell in the child.
 	     */
-	    register char *shellp, *shellname;
+	    char *shellp, *shellname;
 
 	    shellp = getenv("SHELL");
 	    if (shellp == NULL)
@@ -1634,7 +1634,7 @@ struct env_lst envlisthead;
 env_find(var)
 	unsigned char *var;
 {
-	register struct env_lst *ep;
+	struct env_lst *ep;
 
 	for (ep = envlisthead.next; ep; ep = ep->next) {
 		if (strcmp((char *)ep->var, (char *)var) == 0)
@@ -1705,7 +1705,7 @@ env_init()
 env_define(var, value)
 	unsigned char *var, *value;
 {
-	register struct env_lst *ep;
+	struct env_lst *ep;
 
 	if ((ep = env_find(var))) {
 		if (ep->var)
@@ -1734,7 +1734,7 @@ env_define(var, value)
 env_undefine(var)
 	unsigned char *var;
 {
-	register struct env_lst *ep;
+	struct env_lst *ep;
 
 	if ((ep = env_find(var))) {
 		ep->prev->next = ep->next;
@@ -1752,7 +1752,7 @@ env_undefine(var)
 env_export(var)
 	unsigned char *var;
 {
-	register struct env_lst *ep;
+	struct env_lst *ep;
 
 	if ((ep = env_find(var)))
 		ep->export = 1;
@@ -1762,7 +1762,7 @@ env_export(var)
 env_unexport(var)
 	unsigned char *var;
 {
-	register struct env_lst *ep;
+	struct env_lst *ep;
 
 	if ((ep = env_find(var)) != NULL)
 		ep->export = 0;
@@ -1772,7 +1772,7 @@ env_unexport(var)
 env_send(var)
 	unsigned char *var;
 {
-	register struct env_lst *ep;
+	struct env_lst *ep;
 
 	if (my_state_is_wont(TELOPT_NEW_ENVIRON)
 #ifdef	OLD_ENVIRON
@@ -1798,7 +1798,7 @@ env_send(var)
 	void
 env_list()
 {
-	register struct env_lst *ep;
+	struct env_lst *ep;
 
 	for (ep = envlisthead.next; ep; ep = ep->next) {
 		printf("%c %-20s %s\r\n", ep->export ? '*' : ' ',
@@ -1829,7 +1829,7 @@ env_default(init, welldefined)
 env_getvalue(var)
 	unsigned char *var;
 {
-	register struct env_lst *ep;
+	struct env_lst *ep;
 
 	if ((ep = env_find(var)))
 		return(ep->value);
@@ -2622,7 +2622,7 @@ command(top, tbuf, cnt)
     char *tbuf;
     int cnt;
 {
-    register Command *c;
+    Command *c;
 
     setcommandmode();
     if (!top) {
@@ -2637,7 +2637,7 @@ command(top, tbuf, cnt)
 	if (rlogin == _POSIX_VDISABLE)
 		printf("%s> ", prompt);
 	if (tbuf) {
-	    register char *cp;
+	    char *cp;
 	    cp = line;
 	    while (cnt > 0 && (*cp++ = *tbuf++) != '\n')
 		cnt--;
@@ -2705,7 +2705,7 @@ help(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register Command *c;
+	Command *c;
 
 	if (argc == 1) {
 		printf("Commands may be abbreviated.  Commands are:\r\n\r\n");
@@ -2717,7 +2717,7 @@ help(argc, argv)
 		return 0;
 	}
 	while (--argc > 0) {
-		register char *arg;
+		char *arg;
 		arg = *++argv;
 		c = getcmd(arg);
 		if (Ambiguous(c))
@@ -2782,10 +2782,10 @@ sourceroute(arg, cpp, lenp)
 	static IOPTN ipopt;
 #endif
 	char *cp, *cp2, *lsrp, *lsrep;
-	register int tmp;
+	int tmp;
 	struct in_addr sin_addr;
-	register struct hostent *host = 0;
-	register char c;
+	struct hostent *host = 0;
+	char c;
 
 	/*
 	 * Verify the arguments, and make sure we have
diff --git a/usr.bin/telnet/network.c b/usr.bin/telnet/network.c
index 70886f4fb48..e7e2043d986 100644
--- a/usr.bin/telnet/network.c
+++ b/usr.bin/telnet/network.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: network.c,v 1.6 1998/05/15 03:16:39 art Exp $	*/
+/*	$OpenBSD: network.c,v 1.7 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: network.c,v 1.5 1996/02/28 21:04:06 thorpej Exp $	*/
 
 /*
@@ -122,7 +122,7 @@ setneturg()
     int
 netflush()
 {
-    register int n, n1;
+    int n, n1;
 
 #if    defined(ENCRYPTION)
     if (encrypt_output)
diff --git a/usr.bin/telnet/sys_bsd.c b/usr.bin/telnet/sys_bsd.c
index f7a9f14281b..9871de567a6 100644
--- a/usr.bin/telnet/sys_bsd.c
+++ b/usr.bin/telnet/sys_bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_bsd.c,v 1.9 2001/09/04 23:35:59 millert Exp $	*/
+/*	$OpenBSD: sys_bsd.c,v 1.10 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: sys_bsd.c,v 1.11 1996/02/28 21:04:10 thorpej Exp $	*/
 
 /*
@@ -251,7 +251,7 @@ TerminalSaveState()
 
     cc_t *
 tcval(func)
-    register int func;
+    int func;
 {
     switch(func) {
     case SLC_IP:	return(&termIntChar);
@@ -364,7 +364,7 @@ static void ayt();
 
     void
 TerminalNewMode(f)
-    register int f;
+    int f;
 {
     static int prevmode = 0;
 #ifndef	USE_TERMIO
@@ -754,9 +754,9 @@ TerminalSpeeds(ispeed, ospeed)
     long *ospeed;
 {
 #ifdef	DECODE_BAUD
-    register struct termspeeds *tp;
+    struct termspeeds *tp;
 #endif	/* DECODE_BAUD */
-    register long in, out;
+    long in, out;
 
     out = cfgetospeed(&old_tc);
     in = cfgetispeed(&old_tc);
@@ -961,7 +961,7 @@ sys_telnet_init()
 process_rings(netin, netout, netex, ttyin, ttyout, poll)
     int poll;		/* If 0, then block until something to do */
 {
-    register int c;
+    int c;
 		/* One wants to be a bit careful about setting returnValue
 		 * to one, since a one implies we did some useful work,
 		 * and therefore probably won't be called to block next
diff --git a/usr.bin/telnet/telnet.c b/usr.bin/telnet/telnet.c
index d2b7a5d0831..3e8585ad91c 100644
--- a/usr.bin/telnet/telnet.c
+++ b/usr.bin/telnet/telnet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: telnet.c,v 1.12 2001/11/03 00:07:53 hin Exp $	*/
+/*	$OpenBSD: telnet.c,v 1.13 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: telnet.c,v 1.7 1996/02/28 21:04:15 thorpej Exp $	*/
 
 /*
@@ -178,7 +178,7 @@ init_telnet()
 
     void
 send_do(c, init)
-    register int c, init;
+    int c, init;
 {
     if (init) {
 	if (((do_dont_resp[c] == 0) && my_state_is_do(c)) ||
@@ -194,7 +194,7 @@ send_do(c, init)
 
     void
 send_dont(c, init)
-    register int c, init;
+    int c, init;
 {
     if (init) {
 	if (((do_dont_resp[c] == 0) && my_state_is_dont(c)) ||
@@ -210,7 +210,7 @@ send_dont(c, init)
 
     void
 send_will(c, init)
-    register int c, init;
+    int c, init;
 {
     if (init) {
 	if (((will_wont_resp[c] == 0) && my_state_is_will(c)) ||
@@ -226,7 +226,7 @@ send_will(c, init)
 
     void
 send_wont(c, init)
-    register int c, init;
+    int c, init;
 {
     if (init) {
 	if (((will_wont_resp[c] == 0) && my_state_is_wont(c)) ||
@@ -547,8 +547,8 @@ static char *unknown[] = { 0, 0 };
 mklist(buf, name)
 	char *buf, *name;
 {
-	register int n;
-	register char c, *cp, **argvp, *cp2, **argv, **avt;
+	int n;
+	char c, *cp, **argvp, *cp2, **argv, **avt;
 
 	if (name) {
 		if ((int)strlen(name) > 40) {
@@ -657,10 +657,10 @@ mklist(buf, name)
 
 	int
 is_unique(name, as, ae)
-	register char *name, **as, **ae;
+	char *name, **as, **ae;
 {
-	register char **ap;
-	register int n;
+	char **ap;
+	int n;
 
 	n = strlen(name) + 1;
 	for (ap = as; ap < ae; ap++)
@@ -1109,7 +1109,7 @@ static int slc_mode = SLC_EXPORT;
 	void
 slc_init()
 {
-	register struct spc *spcp;
+	struct spc *spcp;
 
 	localchars = 1;
 	for (spcp = spc_data; spcp < &spc_data[NSLC+1]; spcp++) {
@@ -1220,7 +1220,7 @@ slc_import(def)
     void
 slc_export()
 {
-    register struct spc *spcp;
+    struct spc *spcp;
 
     TerminalDefaultChars();
 
@@ -1243,11 +1243,11 @@ slc_export()
 
 	void
 slc(cp, len)
-	register unsigned char *cp;
+	unsigned char *cp;
 	int len;
 {
-	register struct spc *spcp;
-	register int func,level;
+	struct spc *spcp;
+	int func,level;
 
 	slc_start_reply();
 
@@ -1314,7 +1314,7 @@ slc(cp, len)
     void
 slc_check()
 {
-    register struct spc *spcp;
+    struct spc *spcp;
 
     slc_start_reply();
     for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) {
@@ -1362,7 +1362,7 @@ slc_add_reply(func, flags, value)
     void
 slc_end_reply()
 {
-    register int len;
+    int len;
 
     *slc_replyp++ = IAC;
     *slc_replyp++ = SE;
@@ -1379,7 +1379,7 @@ slc_end_reply()
 	int
 slc_update()
 {
-	register struct spc *spcp;
+	struct spc *spcp;
 	int need_update = 0;
 
 	for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) {
@@ -1416,11 +1416,11 @@ int old_env_value = OLD_ENV_VALUE;
 
 	void
 env_opt(buf, len)
-	register unsigned char *buf;
-	register int len;
+	unsigned char *buf;
+	int len;
 {
-	register unsigned char *ep = 0, *epc = 0;
-	register int i;
+	unsigned char *ep = 0, *epc = 0;
+	int i;
 
 	switch(buf[0]&0xff) {
 	case TELQUAL_SEND:
@@ -1523,9 +1523,9 @@ env_opt_start_info()
 
 	void
 env_opt_add(ep)
-	register unsigned char *ep;
+	unsigned char *ep;
 {
-	register unsigned char *vp, c;
+	unsigned char *vp, c;
 
 	if (opt_reply == NULL)		/*XXX*/
 		return;			/*XXX*/
@@ -1546,7 +1546,7 @@ env_opt_add(ep)
 	if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
 				strlen((char *)ep) + 6 > opt_replyend)
 	{
-		register int len;
+		int len;
 		unsigned char *p;
 		opt_replyend += OPT_REPLY_SIZE;
 		len = opt_replyend - opt_reply;
@@ -1614,9 +1614,9 @@ opt_welldefined(ep)
 }
 	void
 env_opt_end(emptyok)
-	register int emptyok;
+	int emptyok;
 {
-	register int len;
+	int len;
 
 	len = opt_replyp - opt_reply + 2;
 	if (emptyok || len > 6) {
@@ -1639,9 +1639,9 @@ env_opt_end(emptyok)
     int
 telrcv()
 {
-    register int c;
-    register int scc;
-    register unsigned char *sbp;
+    int c;
+    int scc;
+    unsigned char *sbp;
     int count;
     int returnValue = 0;
 
@@ -1931,8 +1931,8 @@ telsnd()
     tcc = 0;
     count = 0;
     while (NETROOM() > 2) {
-	register int sc;
-	register int c;
+	int sc;
+	int c;
 
 	if (tcc == 0) {
 	    if (count) {
@@ -2282,7 +2282,7 @@ nextitem(current)
 	return current+3;
     case SB:		/* loop forever looking for the SE */
 	{
-	    register char *look = current+2;
+	    char *look = current+2;
 
 	    for (;;) {
 		if ((*look++&0xff) == IAC) {
@@ -2319,7 +2319,7 @@ nextitem(current)
 netclear()
 {
 #if	0	/* XXX */
-    register char *thisitem, *next;
+    char *thisitem, *next;
     char *good;
 #define	wewant(p)	((nfrontp > p) && ((*p&0xff) == IAC) && \
 				((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
@@ -2413,7 +2413,7 @@ int want_status_response = 0;
 get_status()
 {
     unsigned char tmp[16];
-    register unsigned char *cp;
+    unsigned char *cp;
 
     if (my_want_state_is_dont(TELOPT_STATUS)) {
 	printf("Remote side does not support STATUS option\n");
@@ -2514,7 +2514,7 @@ sendnaws()
 {
     long rows, cols;
     unsigned char tmp[16];
-    register unsigned char *cp;
+    unsigned char *cp;
 
     if (my_state_is_wont(TELOPT_NAWS))
 	return;
diff --git a/usr.bin/telnet/terminal.c b/usr.bin/telnet/terminal.c
index a9d201c8b38..b026bb694b8 100644
--- a/usr.bin/telnet/terminal.c
+++ b/usr.bin/telnet/terminal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: terminal.c,v 1.3 1998/03/12 04:57:45 art Exp $	*/
+/*	$OpenBSD: terminal.c,v 1.4 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: terminal.c,v 1.5 1996/02/28 21:04:17 thorpej Exp $	*/
 
 /*
@@ -109,7 +109,7 @@ init_terminal()
 ttyflush(drop)
     int drop;
 {
-    register int n, n0, n1;
+    int n, n0, n1;
 
     n0 = ring_full_count(&ttyoring);
     if ((n1 = n = ring_full_consecutive(&ttyoring)) > 0) {
@@ -201,7 +201,7 @@ getconnmode()
 setconnmode(force)
     int force;
 {
-    register int newmode;
+    int newmode;
 #ifdef ENCRYPTION
     static int enc_passwd = 0;
 #endif
diff --git a/usr.bin/telnet/tn3270.c b/usr.bin/telnet/tn3270.c
index c814d1da64b..bf31a940fc0 100644
--- a/usr.bin/telnet/tn3270.c
+++ b/usr.bin/telnet/tn3270.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tn3270.c,v 1.3 1998/03/12 04:57:46 art Exp $	*/
+/*	$OpenBSD: tn3270.c,v 1.4 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: tn3270.c,v 1.5 1996/02/28 21:04:18 thorpej Exp $	*/
 
 /*
@@ -99,11 +99,11 @@ init_3270()
 
     int
 DataToNetwork(buffer, count, done)
-    register char *buffer;	/* where the data is */
-    register int  count;	/* how much to send */
+    char *buffer;	/* where the data is */
+    int  count;	/* how much to send */
     int		  done;		/* is this the last of a logical block */
 {
-    register int loop, c;
+    int loop, c;
     int origCount;
 
     origCount = count;
@@ -184,10 +184,10 @@ outputPurge()
 
     int
 DataToTerminal(buffer, count)
-    register char	*buffer;		/* where the data is */
-    register int	count;			/* how much to send */
+    char	*buffer;		/* where the data is */
+    int		count;			/* how much to send */
 {
-    register int c;
+    int c;
     int origCount;
 
     origCount = count;
diff --git a/usr.bin/telnet/utilities.c b/usr.bin/telnet/utilities.c
index aa6b01dcf87..d553692f2c6 100644
--- a/usr.bin/telnet/utilities.c
+++ b/usr.bin/telnet/utilities.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utilities.c,v 1.5 1998/03/12 04:57:47 art Exp $	*/
+/*	$OpenBSD: utilities.c,v 1.6 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: utilities.c,v 1.5 1996/02/28 21:04:21 thorpej Exp $	*/
 
 /*
@@ -51,9 +51,9 @@ int	prettydump;
 
     void
 upcase(argument)
-    register char *argument;
+    char *argument;
 {
-    register int c;
+    int c;
 
     while ((c = *argument) != 0) {
 	if (islower(c)) {
@@ -94,7 +94,7 @@ unsigned char NetTraceFile[256] = "(standard output)";
 
     void
 SetNetTrace(file)
-    register char *file;
+    char *file;
 {
     if (NetTrace && NetTrace != stdout)
 	fclose(NetTrace);
@@ -174,7 +174,7 @@ printoption(direction, cmd, option)
 		else
 		    fprintf(NetTrace, "%s IAC %d", direction, option);
 	} else {
-		register char *fmt;
+		char *fmt;
 		fmt = (cmd == WILL) ? "WILL" : (cmd == WONT) ? "WONT" :
 			(cmd == DO) ? "DO" : (cmd == DONT) ? "DONT" : 0;
 		if (fmt) {
@@ -200,7 +200,7 @@ printoption(direction, cmd, option)
     void
 optionstatus()
 {
-    register int i;
+    int i;
     extern char will_wont_resp[], do_dont_resp[];
 
     for (i = 0; i < 256; i++) {
@@ -280,7 +280,7 @@ printsub(direction, pointer, length)
     unsigned char *pointer;	/* where suboption data sits */
     int		  length;	/* length of suboption data */
 {
-    register int i;
+    int i;
     char buf[512];
     extern int want_status_response;
 
@@ -290,7 +290,7 @@ printsub(direction, pointer, length)
 	    fprintf(NetTrace, "%s IAC SB ",
 				(direction == '<')? "RCVD":"SENT");
 	    if (length >= 3) {
-		register int j;
+		int j;
 
 		i = pointer[length-2];
 		j = pointer[length-1];
@@ -643,8 +643,8 @@ printsub(direction, pointer, length)
 	    break;
 
 	case TELOPT_STATUS: {
-	    register char *cp;
-	    register int j, k;
+	    char *cp;
+	    int j, k;
 
 	    fprintf(NetTrace, "STATUS");
 
@@ -757,7 +757,7 @@ printsub(direction, pointer, length)
 		fprintf(NetTrace, "INFO ");
 	    env_common:
 		{
-		    register int noquote = 2;
+		    int noquote = 2;
 #if defined(ENV_HACK) && defined(OLD_ENVIRON)
 		    extern int old_env_var, old_env_value;
 #endif
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index fc378f6039b..4e5b8c5fcb0 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.8 2001/07/31 14:32:15 mpech Exp $	*/
+/*	$OpenBSD: main.c,v 1.9 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: main.c,v 1.8 2001/07/31 14:32:15 mpech Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.9 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
@@ -253,7 +253,7 @@ modecmd(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register struct modes *p;
+	struct modes *p;
 	char *sep;
 
 	if (argc < 2) {
@@ -320,8 +320,8 @@ put(argc, argv)
 	char *argv[];
 {
 	int fd;
-	register int n;
-	register char *cp, *targ;
+	int n;
+	char *cp, *targ;
 
 	if (argc < 2) {
 		strcpy(line, "send ");
@@ -413,8 +413,8 @@ get(argc, argv)
 	char *argv[];
 {
 	int fd;
-	register int n;
-	register char *cp;
+	int n;
+	char *cp;
 	char *src;
 
 	if (argc < 2) {
@@ -578,7 +578,7 @@ char *
 tail(filename)
 	char *filename;
 {
-	register char *s;
+	char *s;
 
 	while (*filename) {
 		s = strrchr(filename, '/');
@@ -597,7 +597,7 @@ tail(filename)
 static __dead void
 command()
 {
-	register struct cmd *c;
+	struct cmd *c;
 
 	for (;;) {
 		printf("%s> ", prompt);
@@ -629,11 +629,11 @@ command()
 
 struct cmd *
 getcmd(name)
-	register char *name;
+	char *name;
 {
-	register char *p, *q;
-	register struct cmd *c, *found;
-	register int nmatches, longest;
+	char *p, *q;
+	struct cmd *c, *found;
+	int nmatches, longest;
 
 	longest = 0;
 	nmatches = 0;
@@ -662,8 +662,8 @@ getcmd(name)
 static int
 makeargv()
 {
-	register char *cp;
-	register char **argp = margv;
+	char *cp;
+	char **argp = margv;
 	int ret = 0;
 
 	margc = 0;
@@ -706,7 +706,7 @@ help(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register struct cmd *c;
+	struct cmd *c;
 
 	if (argc == 1) {
 		printf("Commands may be abbreviated.  Commands are:\n\n");
@@ -715,7 +715,7 @@ help(argc, argv)
 		return;
 	}
 	while (--argc > 0) {
-		register char *arg;
+		char *arg;
 		arg = *++argv;
 		c = getcmd(arg);
 		if (c == (struct cmd *)-1)
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index ffacababc29..f2c024b0957 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tftp.c,v 1.8 2001/07/31 14:32:15 mpech Exp $	*/
+/*	$OpenBSD: tftp.c,v 1.9 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: tftp.c,v 1.8 2001/07/31 14:32:15 mpech Exp $";
+static char rcsid[] = "$OpenBSD: tftp.c,v 1.9 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
@@ -96,9 +96,9 @@ sendfile(fd, name, mode)
 	char *name;
 	char *mode;
 {
-	register struct tftphdr *ap;	   /* data and ack packets */
+	struct tftphdr *ap;	   /* data and ack packets */
 	struct tftphdr *r_init(), *dp;
-	register int n;
+	int n;
 	volatile int block, size, convert;
 	volatile unsigned long amount;
 	struct sockaddr_in from;
@@ -201,9 +201,9 @@ recvfile(fd, name, mode)
 	char *name;
 	char *mode;
 {
-	register struct tftphdr *ap;
+	struct tftphdr *ap;
 	struct tftphdr *dp, *w_init();
-	register int n;
+	int n;
 	volatile int block, size, firsttrip;
 	volatile unsigned long amount;
 	struct sockaddr_in from;
@@ -311,7 +311,7 @@ makerequest(request, name, tp, mode)
 	struct tftphdr *tp;
 	const char *mode;
 {
-	register char *cp;
+	char *cp;
 
 	tp->th_opcode = htons((u_short)request);
 	cp = tp->th_stuff;
@@ -349,8 +349,8 @@ static void
 nak(error)
 	int error;
 {
-	register struct errmsg *pe;
-	register struct tftphdr *tp;
+	struct errmsg *pe;
+	struct tftphdr *tp;
 	int length;
 
 	tp = (struct tftphdr *)ackbuf;
@@ -381,7 +381,7 @@ tpacket(s, tp, n)
 {
 	static char *opcodes[] =
 	   { "#0", "RRQ", "WRQ", "DATA", "ACK", "ERROR" };
-	register char *cp, *file;
+	char *cp, *file;
 	u_short op = ntohs(tp->th_opcode);
 
 	if (op < RRQ || op > ERROR)
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index 8151a40c853..72edd8120da 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tftpsubs.c,v 1.2 1996/06/26 05:40:36 deraadt Exp $	*/
+/*	$OpenBSD: tftpsubs.c,v 1.3 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.2 1996/06/26 05:40:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.3 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /* Simple minded read-ahead/write-behind subroutines for tftp user and
@@ -132,9 +132,9 @@ read_ahead(file, convert)
 	FILE *file;                     /* file opened for read */
 	int convert;                    /* if true, convert to ascii */
 {
-	register int i;
-	register char *p;
-	register int c;
+	int i;
+	char *p;
+	int c;
 	struct bf *b;
 	struct tftphdr *dp;
 
@@ -204,9 +204,9 @@ write_behind(file, convert)
 {
 	char *buf;
 	int count;
-	register int ct;
-	register char *p;
-	register int c;                 /* current character */
+	int ct;
+	char *p;
+	int c;                          /* current character */
 	struct bf *b;
 	struct tftphdr *dp;
 
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 6e19fabc1d8..9038763d5a7 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: time.c,v 1.9 2001/07/12 05:17:23 deraadt Exp $	*/
+/*	$OpenBSD: time.c,v 1.10 2001/11/19 19:02:16 mpech Exp $	*/
 /*	$NetBSD: time.c,v 1.7 1995/06/27 00:34:00 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: time.c,v 1.9 2001/07/12 05:17:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: time.c,v 1.10 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -68,7 +68,7 @@ main(argc, argv)
 	char **argv;
 {
 	extern int optind;
-	register int pid;
+	int pid;
 	int ch, status;
 	struct timeval before, after;
 	struct rusage ru;
diff --git a/usr.bin/tip/aculib/dn11.c b/usr.bin/tip/aculib/dn11.c
index 7ed77c63ded..3f346159429 100644
--- a/usr.bin/tip/aculib/dn11.c
+++ b/usr.bin/tip/aculib/dn11.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dn11.c,v 1.4 2001/09/26 06:07:28 pvalchev Exp $	*/
+/*	$OpenBSD: dn11.c,v 1.5 2001/11/19 19:02:16 mpech 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.4 2001/09/26 06:07:28 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: dn11.c,v 1.5 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -56,7 +56,7 @@ dn_dialer(num, acu)
 	char *num, *acu;
 {
 	int lt, nw;
-	register int timelim;
+	int timelim;
 	struct termios cntrl;
 
 	if (boolean(value(VERBOSE)))
diff --git a/usr.bin/tip/aculib/v831.c b/usr.bin/tip/aculib/v831.c
index 48d2a10aa6c..005e5d931e5 100644
--- a/usr.bin/tip/aculib/v831.c
+++ b/usr.bin/tip/aculib/v831.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: v831.c,v 1.5 2001/09/26 06:07:28 pvalchev Exp $	*/
+/*	$OpenBSD: v831.c,v 1.6 2001/11/19 19:02:16 mpech 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.5 2001/09/26 06:07:28 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: v831.c,v 1.6 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -60,7 +60,7 @@ v831_dialer(num, acu)
         char *num, *acu;
 {
         int status, pid;
-        register int timelim;
+        int timelim;
 
         if (boolean(value(VERBOSE)))
                 printf("\nstarting call...");
@@ -189,10 +189,10 @@ struct vaconfig {
 
 static int
 dialit(phonenum, acu)
-	register char *phonenum;
+	char *phonenum;
 	char *acu;
 {
-        register struct vaconfig *vp;
+        struct vaconfig *vp;
 	struct termios cntrl;
         char c;
         int i;
@@ -251,10 +251,10 @@ dialit(phonenum, acu)
 
 static char *
 sanitize(s)
-	register char *s;
+	char *s;
 {
         static char buf[128];
-        register char *cp;
+        char *cp;
 
         for (cp = buf; *s; s++) {
 		if (!isdigit(*s) && *s == '<' && *s != '_')
diff --git a/usr.bin/tip/aculib/ventel.c b/usr.bin/tip/aculib/ventel.c
index 04cedc38f48..48035c177d2 100644
--- a/usr.bin/tip/aculib/ventel.c
+++ b/usr.bin/tip/aculib/ventel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ventel.c,v 1.6 2001/09/26 06:07:28 pvalchev Exp $	*/
+/*	$OpenBSD: ventel.c,v 1.7 2001/11/19 19:02:16 mpech 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.6 2001/09/26 06:07:28 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: ventel.c,v 1.7 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -65,16 +65,16 @@ static	void echo();
  */
 #define delay(num,denom) busyloop(CPUSPEED*num/denom)
 #define CPUSPEED 1000000	/* VAX 780 is 1MIPS */
-#define DELAY(n) do { register long N = (n); while (--N > 0); } while (0)
+#define DELAY(n) do { long N = (n); while (--N > 0); } while (0)
 #define busyloop(n) do { DELAY(n); } while (0)
 
 int
 ven_dialer(num, acu)
-	register char *num;
+	char *num;
 	char *acu;
 {
-	register char *cp;
-	register int connected = 0;
+	char *cp;
+	int connected = 0;
 	char *msg, line[80];
 	struct termios	cntrl;
 
@@ -154,7 +154,7 @@ ven_abort()
 
 static void
 echo(s)
-	register char *s;
+	char *s;
 {
 	char c;
 
@@ -186,10 +186,10 @@ sigALRM()
 
 static int
 gobble(match, response)
-	register char match;
+	char match;
 	char response[];
 {
-	register char *cp = response;
+	char *cp = response;
 	sig_t f;
 	char c;
 
diff --git a/usr.bin/tn3270/api/astosc.c b/usr.bin/tn3270/api/astosc.c
index 6926971c225..d0e52308ff6 100644
--- a/usr.bin/tn3270/api/astosc.c
+++ b/usr.bin/tn3270/api/astosc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: astosc.c,v 1.2 1996/06/26 05:41:04 deraadt Exp $	*/
+/*	$OpenBSD: astosc.c,v 1.3 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)astosc.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: astosc.c,v 1.2 1996/06/26 05:41:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: astosc.c,v 1.3 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -54,10 +54,10 @@ struct astosc astosc[256] = {
 
 static
 ustrcmp(string1, string2)
-register char *string1;
-register char *string2;
+char *string1;
+char *string2;
 {
-    register int c1, c2;
+    int c1, c2;
 
     while ((c1 = (unsigned char) *string1++) != 0) {
 	if (isupper(c1)) {
@@ -88,9 +88,9 @@ register char *string2;
 
 int
 ascii_to_index(string)
-register char *string;
+char *string;
 {
-    register struct astosc *this;
+    struct astosc *this;
 
     for (this = astosc; this <= &astosc[highestof(astosc)]; this++) {
 	if ((this->name != 0) && (ustrcmp(this->name, string) == 0)) {
diff --git a/usr.bin/tn3270/ascii/map3270.c b/usr.bin/tn3270/ascii/map3270.c
index 8036684d5d4..b4d48385a3a 100644
--- a/usr.bin/tn3270/ascii/map3270.c
+++ b/usr.bin/tn3270/ascii/map3270.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map3270.c,v 1.3 2000/07/06 08:51:05 deraadt Exp $	*/
+/*	$OpenBSD: map3270.c,v 1.4 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)map3270.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: map3270.c,v 1.3 2000/07/06 08:51:05 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: map3270.c,v 1.4 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*	This program reads a description file, somewhat like /etc/termcap,
@@ -169,8 +169,8 @@ static lexicon
 Get()
 {
     lexicon c;
-    register lexicon *pC = &c;
-    register int character;
+    lexicon *pC = &c;
+    int character;
 
     if (!Empty) {
 	*pC = lifo[rp];
@@ -266,7 +266,7 @@ lexicon c;			/* character to unget */
  */
 char *
 uncontrol(c)
-	register int c;
+	int c;
 {
 	static char buf[3];
 
@@ -289,10 +289,10 @@ uncontrol(c)
 /* compare two strings, ignoring case */
 
 ustrcmp(string1, string2)
-register char *string1;
-register char *string2;
+char *string1;
+char *string2;
 {
-    register int c1, c2;
+    int c1, c2;
 
     while ((c1 = (unsigned char) *string1++) != 0) {
 	if (isupper(c1)) {
diff --git a/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index 13ebfd5fd1d..de285c6fe11 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mset.c,v 1.2 1996/06/26 05:41:11 deraadt Exp $	*/
+/*	$OpenBSD: mset.c,v 1.3 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)mset.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mset.c,v 1.2 1996/06/26 05:41:11 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mset.c,v 1.3 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -114,10 +114,10 @@ struct regstate *regptr, *sptr;
 
 static struct regstate *
 doRegister(regptr)
-register struct regstate *regptr;
+struct regstate *regptr;
 {
     static struct regstate *pivot = regstates;
-    register struct regstate *sptr = pivot;
+    struct regstate *sptr = pivot;
     int check;
 
     if (pivot == regstates) {		/* first time called */
@@ -179,11 +179,11 @@ static char savename[20] = " ";  /* for deciding if name is new */
 
 static void
 printString(string, begin, tc_name)
-register char *string;
+char *string;
 char *begin, *tc_name;
 {
-    register char *st1, *st2;
-    register int pchar;
+    char *st1, *st2;
+    int pchar;
     static char suffix = 'A';
     int new = strcmp(savename, tc_name);
     char delim = new ? ';' : '|';
diff --git a/usr.bin/tn3270/ascii/termin.c b/usr.bin/tn3270/ascii/termin.c
index 58649e6b0d7..b9e3f8c37bd 100644
--- a/usr.bin/tn3270/ascii/termin.c
+++ b/usr.bin/tn3270/ascii/termin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: termin.c,v 1.2 1996/06/26 05:41:12 deraadt Exp $	*/
+/*	$OpenBSD: termin.c,v 1.3 2001/11/19 19:02:16 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)termin.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: termin.c,v 1.2 1996/06/26 05:41:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: termin.c,v 1.3 2001/11/19 19:02:16 mpech Exp $";
 #endif /* not lint */
 
 /* this takes characters from the keyboard, and produces 3270 keystroke
@@ -106,7 +106,7 @@ void
 InitMapping()
 {
     extern state *InitControl();
-    register struct astosc *ptr;
+    struct astosc *ptr;
 
     if (!headOfControl) {
 	/* need to initialize */
@@ -164,7 +164,7 @@ TerminalIn()
 {
     /* send data from us to next link in stream */
     int work = 0;
-    register struct astosc *ptr;
+    struct astosc *ptr;
 
     while (!EmptyChar) {			/* send up the link */
 	if (*ourPHead == ' ') {
@@ -189,12 +189,12 @@ TerminalIn()
 
 int
 DataFromTerminal(buffer, count)
-register char	*buffer;		/* the data read in */
-register int	count;			/* how many bytes in this buffer */
+char	*buffer;		/* the data read in */
+int	count;			/* how many bytes in this buffer */
 {
-    register state *regControlPointer;
-    register char c;
-    register int result;
+    state *regControlPointer;
+    char c;
+    int result;
     int origCount;
     extern int bellwinup;
     static state *controlPointer;
diff --git a/usr.bin/tn3270/ctlr/inbound.c b/usr.bin/tn3270/ctlr/inbound.c
index a07ecf735ce..f2d3863ef74 100644
--- a/usr.bin/tn3270/ctlr/inbound.c
+++ b/usr.bin/tn3270/ctlr/inbound.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inbound.c,v 1.3 1998/03/12 17:31:42 deraadt Exp $	*/
+/*	$OpenBSD: inbound.c,v 1.4 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)inbound.c	4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: inbound.c,v 1.3 1998/03/12 17:31:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: inbound.c,v 1.4 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -121,7 +121,7 @@ init_inbound()
 static void
 Tab()
 {
-    register int i, j;
+    int i, j;
 
     i = CursorAddress;
     j = WhereAttrByte(CursorAddress);
@@ -144,7 +144,7 @@ Tab()
 static void
 BackTab()
 {
-    register int i;
+    int i;
 
     i = ScreenDec(CursorAddress);
     for (;;) {
@@ -195,7 +195,7 @@ int on;
 static void
 EraseEndOfField()
 {
-    register int i;
+    int i;
 
     if (IsProtected(CursorAddress)) {
 	RingBell("Protected Field");
@@ -238,10 +238,10 @@ EraseEndOfField()
 
 static void
 Delete(where, from)
-register int	where,		/* Where to start deleting from */
+int		where,		/* Where to start deleting from */
 		from;		/* Where to pull back from */
 {
-    register int i;
+    int i;
 
     TurnOnMdt(where);			/* Only do this once in this field */
     i = where;
@@ -259,7 +259,7 @@ register int	where,		/* Where to start deleting from */
 static void
 ColBak()
 {
-    register int i;
+    int i;
 
     i = ScreenLineOffset(CursorAddress);
     for (i = i-1; i >= 0; i--) {
@@ -276,7 +276,7 @@ ColBak()
 static void
 ColTab()
 {
-    register int i;
+    int i;
 
     i = ScreenLineOffset(CursorAddress);
     for (i = i+1; i < NumberColumns; i++) {
@@ -293,8 +293,8 @@ ColTab()
 static void
 Home()
 {
-    register int i;
-    register int j;
+    int i;
+    int j;
 
     i = SetBufferAddress(OptHome, 0);
     j = WhereLowByte(i);
@@ -324,10 +324,10 @@ Home()
 
 static
 LastOfField(i)
-register int	i;	/* position to start from */
+int	i;	/* position to start from */
 {
-    register int j;
-    register int k;
+    int j;
+    int k;
 
     k = j = i;
     SetXIsProtected();
@@ -386,9 +386,9 @@ char	character;
 static void
 SendUnformatted()
 {
-    register int i, j;
-    register int Nulls;
-    register int c;
+    int i, j;
+    int Nulls;
+    int c;
 
 			/* look for start of field */
     Nulls = 0;
@@ -410,13 +410,13 @@ SendUnformatted()
 
 static
 SendField(i, cmd)
-register int i;			/* where we saw MDT bit */
+int 	i;			/* where we saw MDT bit */
 int	cmd;			/* The command code (type of read) */
 {
-    register int j;
-    register int k;
-    register int Nulls;
-    register int c;
+    int j;
+    int k;
+    int Nulls;
+    int c;
 
 			/* look for start of field */
     i = j = WhereLowByte(i);
@@ -463,7 +463,7 @@ void
 DoReadModified(cmd)
 int	cmd;			/* The command sent */
 {
-    register int i, j;
+    int i, j;
 
     if (AidByte) {
 	if (AidByte != AID_TREQ) {
@@ -513,7 +513,7 @@ int	cmd;			/* The command sent */
 void
 DoReadBuffer()
 {
-    register int i, j;
+    int i, j;
 
     if (AidByte) {
 	AddChar(AidByte);
@@ -592,7 +592,7 @@ OneCharacter(c, insert)
 int c;			/* character (Ebcdic) to be shoved in */
 int insert;		/* are we in insert mode? */
 {
-    register int i, j;
+    int i, j;
 
     if (IsProtected(CursorAddress)) {
 	RingBell("Protected Field");
@@ -639,9 +639,9 @@ unsigned int
     scancode,			/* 3270 scancode */
     shiftstate;			/* The shift state */
 {
-    register int c;
-    register int i;
-    register int j;
+    int c;
+    int i;
+    int j;
     enum ctlrfcn ctlrfcn;
 
     if (scancode >= numberof(hits)) {
diff --git a/usr.bin/tn3270/ctlr/options.c b/usr.bin/tn3270/ctlr/options.c
index 4ac81245b34..a51213e3390 100644
--- a/usr.bin/tn3270/ctlr/options.c
+++ b/usr.bin/tn3270/ctlr/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.2 1996/06/26 05:41:21 deraadt Exp $	*/
+/*	$OpenBSD: options.c,v 1.3 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)options.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: options.c,v 1.2 1996/06/26 05:41:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: options.c,v 1.2 1996/06/26 05:41:21 deraadt Exp
 void
 OptInit()
 {
-    register int i;
+    int i;
 
     OptAPLmode = 0;
     OptNullProcessing = 1;		/* improved null processing */
diff --git a/usr.bin/tn3270/ctlr/outbound.c b/usr.bin/tn3270/ctlr/outbound.c
index d5ad75cf65a..5fcacba9f02 100644
--- a/usr.bin/tn3270/ctlr/outbound.c
+++ b/usr.bin/tn3270/ctlr/outbound.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: outbound.c,v 1.2 1996/06/26 05:41:22 deraadt Exp $	*/
+/*	$OpenBSD: outbound.c,v 1.3 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)outbound.c	4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: outbound.c,v 1.2 1996/06/26 05:41:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: outbound.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -99,9 +99,9 @@ init_ctlr()
 
 
 FieldInc(position)
-register int	position;		/* Position in previous field */
+int	position;		/* Position in previous field */
 {
-    register ScreenImage *ptr;
+    ScreenImage *ptr;
 
     ptr = (ScreenImage *)memNSchr((char *)Host+position+1, ATTR_MASK,
 			HighestScreen()-position, ATTR_MASK, sizeof Host[0]);
@@ -118,7 +118,7 @@ register int	position;		/* Position in previous field */
 FieldDec(position)
 int	position;
 {
-    register ScreenImage *ptr;
+    ScreenImage *ptr;
 
     ptr = (ScreenImage *)memNSchr((char *)(Host+position)-1, ATTR_MASK,
 			position-LowestScreen(), ATTR_MASK, -sizeof Host[0]);
@@ -183,13 +183,13 @@ char	character;
 int
 DataFromNetwork(Buffer, count, control)
 char	*Buffer;				/* what the data is */
-register int	count;				/* and how much there is */
+int	count;					/* and how much there is */
 int	control;				/* this buffer ended block? */
 {
     int origCount;
-    register unsigned char *buffer = (unsigned char *)Buffer;
-    register int c;
-    register int i;
+    unsigned char *buffer = (unsigned char *)Buffer;
+    int c;
+    int i;
     static int Command;
     static int Wcc;
 
diff --git a/usr.bin/tn3270/general/genbsubs.c b/usr.bin/tn3270/general/genbsubs.c
index 3a5313bf588..554bd6a238b 100644
--- a/usr.bin/tn3270/general/genbsubs.c
+++ b/usr.bin/tn3270/general/genbsubs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: genbsubs.c,v 1.2 1996/06/26 05:41:25 deraadt Exp $	*/
+/*	$OpenBSD: genbsubs.c,v 1.3 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)genbsubs.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: genbsubs.c,v 1.2 1996/06/26 05:41:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: genbsubs.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 /* The output of bunequal is the offset of the byte which didn't match;
@@ -44,10 +44,10 @@ static char rcsid[] = "$OpenBSD: genbsubs.c,v 1.2 1996/06/26 05:41:25 deraadt Ex
 
 int
 bunequal(s1, s2, n)
-register char *s1, *s2;
-register n;
+char *s1, *s2;
+int n;
 {
-    register int i = 0;
+    int i = 0;
 
     while (i++ < n) {
 	if (*s1++ != *s2++) {
@@ -63,11 +63,11 @@ register n;
 
 int
 bskip(s1, n, b)
-register char *s1;
-register int n;
-register int b;
+char *s1;
+int n;
+int b;
 {
-    register int i = 0;
+    int i = 0;
 
     while (i++ < n) {
 	if (*s1++ != b) {
@@ -94,7 +94,7 @@ unsigned int n;
 int and;
 int stride;
 {
-    register unsigned char _c, *_s, _and;
+    unsigned char _c, *_s, _and;
 
     _and = and;
     _c = (c&_and);
diff --git a/usr.bin/tn3270/sys_curses/system.c b/usr.bin/tn3270/sys_curses/system.c
index c22bf7de8f6..15877ee34de 100644
--- a/usr.bin/tn3270/sys_curses/system.c
+++ b/usr.bin/tn3270/sys_curses/system.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: system.c,v 1.9 2001/07/09 07:04:55 deraadt Exp $	*/
+/*	$OpenBSD: system.c,v 1.10 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)system.c	4.5 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: system.c,v 1.9 2001/07/09 07:04:55 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: system.c,v 1.10 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -593,7 +593,7 @@ child_died(code)
 {
     int save_errno = errno;
     union wait status;
-    register int pid;
+    int pid;
 
     while ((pid = wait3((int *)&status, WNOHANG, (struct rusage *)0)) > 0) {
 	if (pid == shell_pid) {
@@ -728,7 +728,7 @@ char	*argv[];
 	    state = UNCONNECTED;
 	}
     } else {				/* New process */
-	register int i;
+	int i;
 
 	for (i = 3; i < 30; i++) {
 	    (void) close(i);
diff --git a/usr.bin/tn3270/sys_curses/termout.c b/usr.bin/tn3270/sys_curses/termout.c
index f94d4b61447..3e0c4a52c68 100644
--- a/usr.bin/tn3270/sys_curses/termout.c
+++ b/usr.bin/tn3270/sys_curses/termout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: termout.c,v 1.7 2000/10/11 19:28:02 millert Exp $	*/
+/*	$OpenBSD: termout.c,v 1.8 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)termout.c	4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: termout.c,v 1.7 2000/10/11 19:28:02 millert Exp $";
+static char rcsid[] = "$OpenBSD: termout.c,v 1.8 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #if defined(unix)
@@ -166,9 +166,9 @@ int	where;		/* cursor address */
 
 static int
 WhereTermAttrByte(p)
-register int	p;
+int	p;
 {
-    register int i;
+    int i;
 
     i = p;
 
@@ -207,10 +207,10 @@ static void
 #endif	/* defined(NOT43) */
 SlowScreen()
 {
-    register int is, shouldbe, isattr, shouldattr;
-    register int pointer;
-    register int fieldattr, termattr;
-    register int columnsleft;
+    int is, shouldbe, isattr, shouldattr;
+    int pointer;
+    int fieldattr, termattr;
+    int columnsleft;
 
 #define	NORMAL		0		
 #define	HIGHLIGHT	1		/* Mask bits */
@@ -504,7 +504,7 @@ FastScreen()
  * In particular, we separate out the two cases from the beginning.
  */
     if ((Highest != HighestScreen()) || (Lowest != LowestScreen())) {
-	register int columnsleft;
+	int columnsleft;
 
 	move(ScreenLine(Lowest), ScreenLineOffset(Lowest));
 	p = &Host[Lowest];
@@ -546,7 +546,7 @@ FastScreen()
     } else {		/* Going from Lowest to Highest */
 	unsigned char tmpbuf[MAXNUMBERCOLUMNS+1];
 	ScreenImage *End = &Host[ScreenSize]-1-SaveCorner;
-	register unsigned char *tmp = tmpbuf, *tmpend = tmpbuf+NumberColumns;
+	unsigned char *tmp = tmpbuf, *tmpend = tmpbuf+NumberColumns;
 
 	*tmpend = 0;		/* terminate from the beginning */
 	move(0,0);
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.c b/usr.bin/tn3270/tools/mkhits/dohits.c
index 9158e9bae2e..e3dc7d05338 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.c
+++ b/usr.bin/tn3270/tools/mkhits/dohits.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dohits.c,v 1.3 1998/05/02 02:27:18 mickey Exp $	*/
+/*	$OpenBSD: dohits.c,v 1.4 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)dohits.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: dohits.c,v 1.3 1998/05/02 02:27:18 mickey Exp $";
+static char rcsid[] = "$OpenBSD: dohits.c,v 1.4 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -80,8 +80,8 @@ dohash(seed, string)
 unsigned int seed;
 char *string;
 {
-    register unsigned int i = seed;
-    register unsigned char c;
+    unsigned int i = seed;
+    unsigned char c;
 
     while (c = *string++) {
 	if (c >= 0x60) {
diff --git a/usr.bin/tn3270/tools/prt3270.c b/usr.bin/tn3270/tools/prt3270.c
index 94caead8164..518f36f5f1b 100644
--- a/usr.bin/tn3270/tools/prt3270.c
+++ b/usr.bin/tn3270/tools/prt3270.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prt3270.c,v 1.2 1996/06/26 05:41:35 deraadt Exp $	*/
+/*	$OpenBSD: prt3270.c,v 1.3 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)prt3270.c	4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: prt3270.c,v 1.2 1996/06/26 05:41:35 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: prt3270.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #if defined(unix)
@@ -252,13 +252,13 @@ int	i;
 /* returns the number of characters consumed */
 int
 DataFromNetwork(buffer, count, control)
-register unsigned char	*buffer;		/* what the data is */
-register int	count;				/* and how much there is */
+unsigned char	*buffer;			/* what the data is */
+int	count;					/* and how much there is */
 int	control;				/* this buffer ended block? */
 {
     int origCount;
-    register int c;
-    register int i;
+    int c;
+    int i;
     static int Command;
     static int Wcc;
     static int	LastWasTerminated = 1;	/* was "control" = 1 last time? */
diff --git a/usr.bin/top/commands.c b/usr.bin/top/commands.c
index 760fb08b339..7ab0927aa35 100644
--- a/usr.bin/top/commands.c
+++ b/usr.bin/top/commands.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: commands.c,v 1.2 1997/08/22 07:16:26 downsj Exp $	*/
+/*	$OpenBSD: commands.c,v 1.3 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*
  *  Top users/processes display for Unix
@@ -97,7 +97,7 @@ u       - display processes for only one user (+ selects all users)\n\
 
 static char *next_field(str)
 
-register char *str;
+char *str;
 
 {
     if ((str = strchr(str, ' ')) == NULL)
@@ -118,8 +118,8 @@ char *str;
 int  *intp;
 
 {
-    register int val = 0;
-    register char ch;
+    int val = 0;
+    char ch;
 
     /* if there is nothing left of the string, flag it as an error */
     /* This fix is dedicated to Greg Earle */
@@ -194,10 +194,10 @@ static char *err_listem =
 static char *err_string()
 
 {
-    register struct errs *errp;
-    register int  cnt = 0;
-    register int  first = Yes;
-    register int  currerr = -1;
+    struct errs *errp;
+    int  cnt = 0;
+    int  first = Yes;
+    int  currerr = -1;
     int stringlen;		/* characters still available in "string" */
     static char string[STRMAX];
 
@@ -258,8 +258,8 @@ int len;
 int err;
 
 {
-    register char *msg;
-    register int  msglen;
+    char *msg;
+    int  msglen;
 
     msg = err == 0 ? "Not a number" : strerror(err);
     msglen = strlen(msg) + 2;
@@ -286,7 +286,7 @@ char *arg;
 int  first;
 
 {
-    register int arglen;
+    int arglen;
 
     arglen = strlen(arg);
     if (!first)
@@ -315,9 +315,9 @@ static int err_compar(e1, e2)
 const void *e1, *e2;
 
 {
-    register const struct errs *p1 = (struct errs *)e1;
-    register const struct errs *p2 = (struct errs *)e2;
-    register int result;
+    const struct errs *p1 = (struct errs *)e1;
+    const struct errs *p2 = (struct errs *)e2;
+    int result;
 
     if ((result = p1->errno - p2->errno) == 0)
     {
@@ -343,8 +343,8 @@ int error_count()
 void show_errors()
 
 {
-    register int cnt = 0;
-    register struct errs *errp = errs;
+    int cnt = 0;
+    struct errs *errp = errs;
 
     printf("%d error%s:\n\n", errcnt, errcnt == 1 ? "" : "s");
     while (cnt++ < errcnt)
@@ -365,7 +365,7 @@ char *kill_procs(str)
 char *str;
 
 {
-    register char *nptr;
+    char *nptr;
     int signum = SIGTERM;	/* default */
     int procnum;
     struct sigdesc *sigp;
@@ -455,7 +455,7 @@ char *renice_procs(str)
 char *str;
 
 {
-    register char negate;
+    char negate;
     int prio;
     int procnum;
     int uid;
diff --git a/usr.bin/top/display.c b/usr.bin/top/display.c
index ea6feb368db..5cde4fe3aae 100644
--- a/usr.bin/top/display.c
+++ b/usr.bin/top/display.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: display.c,v 1.7 2001/09/03 18:08:10 camield Exp $	*/
+/*	$OpenBSD: display.c,v 1.8 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*
  *  Top users/processes display for Unix
@@ -91,7 +91,7 @@ static void line_update();
 int display_resize()
 
 {
-    register int display_lines;
+    int display_lines;
 
     /* first, deallocate any previous buffer that may have been there */
     if (screenbuf != NULL)
@@ -130,10 +130,10 @@ int display_init(statics)
 struct statics *statics;
 
 {
-    register int display_lines;
-    register char **pp;
-    register int *ip;
-    register int i;
+    int display_lines;
+    char **pp;
+    int *ip;
+    int i;
 
     /* call resize to do the dirty work */
     display_lines = display_resize();
@@ -179,7 +179,7 @@ int mpid;
 double *avenrun;
 
 {
-    register int i;
+    int i;
 
     /* i_loadave also clears the screen, since it is first */
     clear();
@@ -207,7 +207,7 @@ int mpid;
 double *avenrun;
 
 {
-    register int i;
+    int i;
 
     if (mpid != -1)
     {
@@ -293,7 +293,7 @@ int total;
 int *brkdn;
 
 {
-    register int i;
+    int i;
 
     /* write current number of processes and remember the value */
     printf("%d processes:", total);
@@ -323,7 +323,7 @@ int *brkdn;
 
 {
     static char new[128];
-    register int i;
+    int i;
 
     /* update number of processes only if it has changed */
     if (ltotal != total)
@@ -379,7 +379,7 @@ static int cpustates_column;
 static char *cpustates_tag()
 
 {
-    register char *use;
+    char *use;
 
     static char *short_tag = "CPU: ";
     static char *long_tag = "CPU states: ";
@@ -402,13 +402,13 @@ static char *cpustates_tag()
 
 void i_cpustates(states)
 
-register int *states;
+int *states;
 
 {
-    register int i = 0;
-    register int value;
-    register char **names = cpustate_names;
-    register char *thisname;
+    int i = 0;
+    int value;
+    char **names = cpustate_names;
+    char *thisname;
 
     /* print tag and bump lastline */
     printf("\n%s", cpustates_tag());
@@ -436,14 +436,14 @@ register int *states;
 
 void u_cpustates(states)
 
-register int *states;
+int *states;
 
 {
-    register int value;
-    register char **names = cpustate_names;
-    register char *thisname;
-    register int *lp;
-    register int *colp;
+    int value;
+    char **names = cpustate_names;
+    char *thisname;
+    int *lp;
+    int *colp;
 
     Move_to(cpustates_column, y_cpustates);
     lastline = y_cpustates;
@@ -484,10 +484,10 @@ register int *states;
 void z_cpustates()
 
 {
-    register int i = 0;
-    register char **names = cpustate_names;
-    register char *thisname;
-    register int *lp;
+    int i = 0;
+    char **names = cpustate_names;
+    char *thisname;
+    int *lp;
 
     /* show tag and bump lastline */
     printf("\n%s", cpustates_tag());
@@ -649,8 +649,8 @@ int line;
 char *thisline;
 
 {
-    register char *p;
-    register char *base;
+    char *p;
+    char *base;
 
     /* make sure we are on the correct line */
     while (lastline < y_procs + line)
@@ -681,9 +681,9 @@ int linenum;
 char *linebuf;
 
 {
-    register char *optr;
-    register int screen_line = linenum + Header_lines;
-    register char *bufferline;
+    char *optr;
+    int screen_line = linenum + Header_lines;
+    char *bufferline;
 
     /* remember a pointer to the current line in the screen buffer */
     bufferline = &screenbuf[lineindex(linenum)];
@@ -726,11 +726,11 @@ char *linebuf;
 
 void u_endscreen(hi)
 
-register int hi;
+int hi;
 
 {
-    register int screen_line = hi + Header_lines;
-    register int i;
+    int screen_line = hi + Header_lines;
+    int i;
 
     if (smart_terminal)
     {
@@ -810,7 +810,7 @@ char *msgfmt;
 caddr_t a1, a2, a3;
 
 {
-    register int i;
+    int i;
 
     /* first, format the message */
     (void) snprintf(next_msg, sizeof(next_msg), msgfmt, a1, a2, a3);
@@ -869,10 +869,10 @@ int  size;
 int  numeric;
 
 {
-    register char *ptr = buffer;
-    register char ch;
-    register char cnt = 0;
-    register char maxcnt = 0;
+    char *ptr = buffer;
+    char ch;
+    char cnt = 0;
+    char maxcnt = 0;
 
     /* allow room for null terminator */
     size -= 1;
@@ -957,10 +957,10 @@ int  numeric;
 
 static int string_count(pp)
 
-register char **pp;
+char **pp;
 
 {
-    register int cnt;
+    int cnt;
 
     cnt = 0;
     while (*pp++ != NULL)
@@ -974,12 +974,12 @@ static void summary_format(str, numbers, names)
 
 char *str;
 int *numbers;
-register char **names;
+char **names;
 
 {
-    register char *p;
-    register int num;
-    register char *thisname;
+    char *p;
+    int num;
+    char *thisname;
 
     /* format each number followed by its string */
     p = str;
@@ -1023,16 +1023,16 @@ register char **names;
 
 static void line_update(old, new, start, line)
 
-register char *old;
-register char *new;
+char *old;
+char *new;
 int start;
 int line;
 
 {
-    register int ch;
-    register int diff;
-    register int newcol = start + 1;
-    register int lastcol = start;
+    int ch;
+    int diff;
+    int newcol = start + 1;
+    int lastcol = start;
     char cursor_on_line = No;
     char *current;
 
@@ -1156,8 +1156,8 @@ char *printable(str)
 char *str;
 
 {
-    register char *ptr;
-    register char ch;
+    char *ptr;
+    char ch;
 
     ptr = str;
     while ((ch = *ptr) != '\0')
diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c
index 5710ddfc9ea..330929c7664 100644
--- a/usr.bin/top/top.c
+++ b/usr.bin/top/top.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: top.c,v 1.13 2001/11/17 19:57:36 deraadt Exp $	*/
+/*	$OpenBSD: top.c,v 1.14 2001/11/19 19:02:17 mpech Exp $	*/
 
 const char copyright[] = "Copyright (c) 1984 through 1996, William LeFebvre";
 
@@ -105,9 +105,9 @@ int  argc;
 char *argv[];
 
 {
-    register int i;
-    register int active_procs;
-    register int change;
+    int i;
+    int active_procs;
+    int change;
 
     struct system_info system_info;
     struct statics statics;
diff --git a/usr.bin/top/username.c b/usr.bin/top/username.c
index 696bebe162d..09871f2f65b 100644
--- a/usr.bin/top/username.c
+++ b/usr.bin/top/username.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: username.c,v 1.3 2001/07/27 17:04:06 deraadt Exp $	*/
+/*	$OpenBSD: username.c,v 1.4 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*
  *  Top users/processes display for Unix
@@ -70,10 +70,10 @@ void init_hash()
 
 char *username(uid)
 
-register uid_t uid;
+uid_t uid;
 
 {
-    register int hashindex;
+    int hashindex;
 
     hashindex = hashit(uid);
     if (is_empty_hash(hashindex) || (hash_table[hashindex].uid != uid))
@@ -109,12 +109,12 @@ char *username;
 
 static int enter_user(uid, name, wecare)
 
-register uid_t  uid;
-register char *name;
+uid_t  uid;
+char *name;
 int wecare;		/* 1 = enter it always, 0 = nice to have */
 
 {
-    register int hashindex;
+    int hashindex;
 
 #ifdef DEBUG
     fprintf(stderr, "enter_hash(%d, %s, %d)\n", uid, name, wecare);
@@ -146,7 +146,7 @@ int wecare;		/* 1 = enter it always, 0 = nice to have */
 
 static int get_user(uid)
 
-register uid_t uid;
+uid_t uid;
 
 {
     struct passwd *pwd;
diff --git a/usr.bin/top/utils.c b/usr.bin/top/utils.c
index 1782376f6a6..a2dbcee3174 100644
--- a/usr.bin/top/utils.c
+++ b/usr.bin/top/utils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utils.c,v 1.3 1998/09/20 06:19:14 niklas Exp $	*/
+/*	$OpenBSD: utils.c,v 1.4 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*
  *  Top users/processes display for Unix
@@ -28,7 +28,7 @@ int atoiwi(str)
 char *str;
 
 {
-    register int len;
+    int len;
 
     len = strlen(str);
     if (len != 0)
@@ -66,10 +66,10 @@ char *str;
 
 char *itoa(val)
 
-register int val;
+int val;
 
 {
-    register char *ptr;
+    char *ptr;
     static char buffer[16];	/* result is built here */
     				/* 16 is sufficient since the largest number
 				   we will ever convert will be 2^32-1,
@@ -97,10 +97,10 @@ register int val;
 
 char *itoa7(val)
 
-register int val;
+int val;
 
 {
-    register char *ptr;
+    char *ptr;
     static char buffer[25];	/* result is built here */
 
     ptr = buffer + sizeof(buffer);
@@ -131,7 +131,7 @@ int digits(val)
 int val;
 
 {
-    register int cnt = 0;
+    int cnt = 0;
 
     while (val > 0)
     {
@@ -148,8 +148,8 @@ int val;
 
 char *strecpy(to, from)
 
-register char *to;
-register char *from;
+char *to;
+char *from;
 
 {
     while ((*to++ = *from++) != '\0');
@@ -166,7 +166,7 @@ char *string;
 char **array;
 
 {
-    register int i = 0;
+    int i = 0;
 
     while (*array != NULL)
     {
@@ -193,13 +193,13 @@ char *line;
 int *cntp;
 
 {
-    register char *from;
-    register char *to;
-    register int cnt;
-    register int ch;
+    char *from;
+    char *to;
+    int cnt;
+    int ch;
     int length;
     int lastch;
-    register char **argv;
+    char **argv;
     char **argarray;
     char *args;
 
@@ -276,15 +276,15 @@ int percentages(cnt, out, new, old, diffs)
 
 int cnt;
 int *out;
-register long *new;
-register long *old;
+long *new;
+long *old;
 long *diffs;
 
 {
-    register int i;
-    register long change;
-    register long total_change;
-    register long *dp;
+    int i;
+    long change;
+    long total_change;
+    long *dp;
     long half_total;
 
     /* initialization */
@@ -402,9 +402,9 @@ int amt;
 {
     static char retarray[NUM_STRINGS][16];
     static int index = 0;
-    register char *p;
-    register char *ret;
-    register char tag = 'K';
+    char *p;
+    char *ret;
+    char tag = 'K';
 
     p = ret = retarray[index];
     index = (index + 1) % NUM_STRINGS;
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index b68e7b7552e..690713585d9 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: str.c,v 1.5 1998/12/07 18:23:29 deraadt Exp $	*/
+/*	$OpenBSD: str.c,v 1.6 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: str.c,v 1.7 1995/08/31 22:13:47 jtc Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
 #endif
-static char rcsid[] = "$OpenBSD: str.c,v 1.5 1998/12/07 18:23:29 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: str.c,v 1.6 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
@@ -64,9 +64,9 @@ static void	genseq __P((STR *));
 
 int
 next(s)
-	register STR *s;
+	STR *s;
 {
-	register int ch;
+	int ch;
 
 	switch (s->state) {
 	case EOS:
@@ -122,9 +122,9 @@ next(s)
 
 static int
 bracket(s)
-	register STR *s;
+	STR *s;
 {
-	register char *p;
+	char *p;
 
 	switch (s->str[1]) {
 	case ':':				/* "[:class:]" */
@@ -178,7 +178,7 @@ static void
 genclass(s)
 	STR *s;
 {
-	register int cnt, (*func) __P((int));
+	int cnt, (*func) __P((int));
 	CLASS *cp, tmp;
 	int *p;
 
@@ -294,9 +294,9 @@ genseq(s)
  */
 static int
 backslash(s)
-	register STR *s;
+	STR *s;
 {
-	register int ch, cnt, val;
+	int ch, cnt, val;
 
 	for (cnt = val = 0;;) {
 		ch = *++s->str;
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index bfa7d1e1a79..ee9e5cefe2e 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tr.c,v 1.5 1997/07/25 21:14:04 mickey Exp $	*/
+/*	$OpenBSD: tr.c,v 1.6 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
 #endif
-static char rcsid[] = "$OpenBSD: tr.c,v 1.5 1997/07/25 21:14:04 mickey Exp $";
+static char rcsid[] = "$OpenBSD: tr.c,v 1.6 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -103,7 +103,7 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register int ch, cnt, lastch, *p;
+	int ch, cnt, lastch, *p;
 	int cflag, dflag, sflag, isstring2;
 
 	cflag = dflag = sflag = 0;
@@ -246,7 +246,7 @@ setup(string, arg, str, cflag)
 	STR *str;
 	int cflag;
 {
-	register int cnt, *p;
+	int cnt, *p;
 
 	str->str = arg;
 	bzero(string, NCHARS * sizeof(int));
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 393f99bfbc4..32c155120a2 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tset.c,v 1.24 2001/07/16 06:14:31 pvalchev Exp $	*/
+/*	$OpenBSD: tset.c,v 1.25 2001/11/19 19:02:17 mpech Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
@@ -161,7 +161,7 @@ failed(const char *msg)
 static void
 cat(char *file)
 {
-    register int fd, nr;
+    int fd, nr;
     char buf[BUFSIZ];
 
     if ((fd = open(file, O_RDONLY, 0)) < 0)
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index ce7dce80a1e..8da3a1dc3c9 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ul.c,v 1.6 2001/07/12 05:17:27 deraadt Exp $	*/
+/*	$OpenBSD: ul.c,v 1.7 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: ul.c,v 1.6 2001/07/12 05:17:27 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ul.c,v 1.7 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -328,9 +328,9 @@ flushln()
 void
 overstrike()
 {
-	register int i;
+	int i;
 	char lbuf[256];
-	register char *cp = lbuf;
+	char *cp = lbuf;
 	int hadbold=0;
 
 	/* Set up overstrike buffer */
@@ -366,9 +366,9 @@ overstrike()
 void
 iattr()
 {
-	register int i;
+	int i;
 	char lbuf[256];
-	register char *cp = lbuf;
+	char *cp = lbuf;
 
 	for (i=0; i<maxcol; i++)
 		switch (obuf[i].c_mode) {
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index b2fb1d32d0a..993b4112856 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unexpand.c,v 1.3 1999/02/11 23:08:25 deraadt Exp $	*/
+/*	$OpenBSD: unexpand.c,v 1.4 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: unexpand.c,v 1.5 1994/12/24 17:08:05 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: unexpand.c,v 1.3 1999/02/11 23:08:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: unexpand.c,v 1.4 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -64,7 +64,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register char *cp;
+	char *cp;
 
 	argc--, argv++;
 	if (argc > 0 && argv[0][0] == '-') {
@@ -99,8 +99,8 @@ void
 tabify(c)
 	char c;
 {
-	register char *cp, *dp;
-	register int dcol;
+	char *cp, *dp;
+	int dcol;
 	int ocol;
 
 	ocol = 0;
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index b1b0cd9c252..b5ff668a7ee 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uniq.c,v 1.7 2001/07/12 05:17:28 deraadt Exp $	*/
+/*	$OpenBSD: uniq.c,v 1.8 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
 #endif
-static char rcsid[] = "$OpenBSD: uniq.c,v 1.7 2001/07/12 05:17:28 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: uniq.c,v 1.8 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <errno.h>
@@ -74,7 +74,7 @@ main (argc, argv)
 	int argc;
 	char *argv[];
 {
-	register char *t1, *t2;
+	char *t1, *t2;
 	FILE *ifp, *ofp;
 	int ch;
 	char *prevline, *thisline, *p;
@@ -187,9 +187,9 @@ show(ofp, str)
 
 char *
 skip(str)
-	register char *str;
+	char *str;
 {
-	register int infield, nchars, nfields;
+	int infield, nchars, nfields;
 
 	for (nfields = numfields, infield = 0; nfields && *str; ++str)
 		if (isspace(*str)) {
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 222ebeea811..1144ce587f6 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unvis.c,v 1.3 1997/01/15 23:43:29 millert Exp $	*/
+/*	$OpenBSD: unvis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: unvis.c,v 1.3 1997/01/15 23:43:29 millert Exp $";
+static char rcsid[] = "$OpenBSD: unvis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -89,7 +89,7 @@ process(fp, filename)
 	FILE *fp;
 	const char *filename;
 {
-	register int offset = 0, c, ret;
+	int offset = 0, c, ret;
 	int state = 0;
 	char outc;
 
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index 6285c3face4..69b7e6b4dcd 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: users.c,v 1.3 1997/01/15 23:43:30 millert Exp $	*/
+/*	$OpenBSD: users.c,v 1.4 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: users.c,v 1.5 1994/12/20 15:58:19 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)users.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: users.c,v 1.3 1997/01/15 23:43:30 millert Exp $";
+static char rcsid[] = "$OpenBSD: users.c,v 1.4 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -64,8 +64,8 @@ main(argc, argv)
 	char **argv;
 {
 	namebuf *names = NULL;
-	register int ncnt = 0;
-	register int nmax = 0;
+	int ncnt = 0;
+	int nmax = 0;
 	int cnt;
 	struct utmp utmp;
 	int ch;
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index f517d2fece9..041309e7904 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uudecode.c,v 1.8 2000/02/01 03:23:46 deraadt Exp $	*/
+/*	$OpenBSD: uudecode.c,v 1.9 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: uudecode.c,v 1.6 1994/11/17 07:40:43 jtc Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
 #endif
-static char rcsid[] = "$OpenBSD: uudecode.c,v 1.8 2000/02/01 03:23:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: uudecode.c,v 1.9 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -113,8 +113,8 @@ static int
 decode(int tostdout)
 {
 	struct passwd *pw;
-	register int n;
-	register char ch, *p;
+	int n;
+	char ch, *p;
 	int mode, n1;
 	char buf[MAXPATHLEN];
 
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index d5091cd7ed5..9499aa8655d 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uuencode.c,v 1.3 2001/07/12 05:17:28 deraadt Exp $	*/
+/*	$OpenBSD: uuencode.c,v 1.4 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: uuencode.c,v 1.7 1994/11/17 07:41:15 jtc Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
 #endif
-static char rcsid[] = "$OpenBSD: uuencode.c,v 1.3 2001/07/12 05:17:28 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: uuencode.c,v 1.4 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -116,8 +116,8 @@ main(argc, argv)
 static void
 encode()
 {
-	register int ch, n;
-	register char *p;
+	int ch, n;
+	char *p;
 	char buf[80];
 
 	while ((n = fread(buf, 1, 45, stdin))) {
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index 7ae1ce1679c..bdb2a571ea1 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vacation.c,v 1.14 2001/07/09 07:04:56 deraadt Exp $	*/
+/*	$OpenBSD: vacation.c,v 1.15 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)vacation.c	8.2 (Berkeley) 1/26/94";
 #endif
-static char rcsid[] = "$OpenBSD: vacation.c,v 1.14 2001/07/09 07:04:56 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vacation.c,v 1.15 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -209,8 +209,8 @@ main(argc, argv)
 void
 readheaders()
 {
-	register ALIAS *cur;
-	register char *p;
+	ALIAS *cur;
+	char *p;
 	int tome, cont;
 	char buf[MAXLINE];
 
@@ -312,9 +312,9 @@ findme:			for (cur = names; !tome && cur; cur = cur->next)
  */
 int
 nsearch(name, str)
-	register char *name, *str;
+	char *name, *str;
 {
-	register int len;
+	int len;
 
 	for (len = strlen(name); *str; ++str)
 		if (!strncasecmp(name, str, len))
@@ -341,9 +341,9 @@ junkmail()
 		{ "-relay", 6 },
 		{ NULL, 0 }
 	};
-	register struct ignore *cur;
-	register int len;
-	register char *p;
+	struct ignore *cur;
+	int len;
+	char *p;
 
 	/*
 	 * This is mildly amusing, and I'm not positive it's right; trying
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index da1bcb81118..90476142d4c 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regexp.c,v 1.2 1996/06/26 05:42:29 deraadt Exp $	*/
+/*	$OpenBSD: regexp.c,v 1.3 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: regexp.c,v 1.3 1994/11/17 08:28:02 jtc Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)regexp.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: regexp.c,v 1.2 1996/06/26 05:42:29 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: regexp.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -72,8 +72,8 @@ boolean	 l_onecase;	/* true if upper and lower equivalent */
 
 int
 STRNCMP(s1, s2, len)
-	register char *s1,*s2;
-	register int len;
+	char *s1,*s2;
+	int len;
 {
 	if (l_onecase) {
 	    do
@@ -156,7 +156,7 @@ char *
 convexp(re)
     char *re;		/* unconverted irregular expression */
 {
-    register char *cre;		/* pointer to converted regular expression */
+    char *cre;		/* pointer to converted regular expression */
 
     /* allocate room for the converted expression */
     if (re == NIL)
@@ -181,10 +181,10 @@ convexp(re)
 static void
 expconv()
 {
-    register char *cs;		/* pointer to current symbol in converted exp */
-    register char c;		/* character being processed */
-    register char *acs;		/* pinter to last alternate */
-    register int temp;
+    char *cs;		/* pointer to current symbol in converted exp */
+    char c;		/* character being processed */
+    char *acs;		/* pinter to last alternate */
+    int temp;
 
     /* let the conversion begin */
     acs = NIL;
@@ -351,12 +351,12 @@ expconv()
 
 char *
 expmatch (s, re, mstring)
-    register char *s;		/* string to check for a match in */
-    register char *re;		/* a converted irregular expression */
-    register char *mstring;	/* where to put whatever matches a \p */
+    char *s;			/* string to check for a match in */
+    char *re;			/* a converted irregular expression */
+    char *mstring;		/* where to put whatever matches a \p */
 {
-    register char *cs;		/* the current symbol */
-    register char *ptr,*s1;	/* temporary pointer */
+    char *cs;			/* the current symbol */
+    char *ptr,*s1;		/* temporary pointer */
     boolean matched;		/* a temporary boolean */
 
     /* initial conditions */
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 9cf00d415b0..ddda22a9d72 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfontedpr.c,v 1.4 2001/07/12 05:17:29 deraadt Exp $	*/
+/*	$OpenBSD: vfontedpr.c,v 1.5 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: vfontedpr.c,v 1.4 1996/03/21 18:08:30 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)vfontedpr.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: vfontedpr.c,v 1.4 2001/07/12 05:17:29 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vfontedpr.c,v 1.5 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -356,7 +356,7 @@ static void
 putScp(os)
     char *os;
 {
-    register char *s = os;		/* pointer to unmatched string */
+    char *s = os;			/* pointer to unmatched string */
     char dummy[BUFSIZ];			/* dummy to be used by expmatch */
     char *comptr;			/* end of a comment delimiter */
     char *acmptr;			/* end of a comment delimiter */
@@ -593,9 +593,9 @@ tabs(s, os)
 
 static int
 width(s, os)
-	register char *s, *os;
+	char *s, *os;
 {
-	register int i = 0;
+	int i = 0;
 
 	while (s < os) {
 		if (*s == '\t') {
@@ -614,7 +614,7 @@ width(s, os)
 
 static void
 putcp(c)
-	register int c;
+	int c;
 {
 
 	switch(c) {
@@ -695,11 +695,11 @@ isproc(s)
 
 static int
 iskw(s)
-	register char *s;
+	char *s;
 {
-	register char **ss = l_keywds;
-	register int i = 1;
-	register char *cp = s;
+	char **ss = l_keywds;
+	int i = 1;
+	char *cp = s;
 
 	while (++cp, isidchr(*cp))
 		i++;
diff --git a/usr.bin/vgrind/vgrindefs.c b/usr.bin/vgrind/vgrindefs.c
index 3734f51a08f..9d5b3d65645 100644
--- a/usr.bin/vgrind/vgrindefs.c
+++ b/usr.bin/vgrind/vgrindefs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgrindefs.c,v 1.2 1996/06/26 05:42:32 deraadt Exp $	*/
+/*	$OpenBSD: vgrindefs.c,v 1.3 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: vgrindefs.c,v 1.5 1994/12/20 12:05:29 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)vgrindefs.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: vgrindefs.c,v 1.2 1996/06/26 05:42:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vgrindefs.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #define	BUFSIZ	1024
@@ -77,9 +77,9 @@ char	*tgetstr();
 tgetent(bp, name, file)
 	char *bp, *name, *file;
 {
-	register char *cp;
-	register int c;
-	register int i = 0, cnt = 0;
+	char *cp;
+	int c;
+	int i = 0, cnt = 0;
 	char ibuf[BUFSIZ];
 	char *cp2;
 	int tf;
@@ -136,7 +136,7 @@ tgetent(bp, name, file)
  */
 tnchktc()
 {
-	register char *p, *q;
+	char *p, *q;
 	char tcname[16];	/* name of similar terminal */
 	char tcbuf[BUFSIZ];
 	char *holdtbuf = tbuf;
@@ -184,7 +184,7 @@ tnchktc()
 tnamatch(np)
 	char *np;
 {
-	register char *Np, *Bp;
+	char *Np, *Bp;
 
 	Bp = tbuf;
 	if (*Bp == '#')
@@ -209,7 +209,7 @@ tnamatch(np)
  */
 static char *
 tskip(bp)
-	register char *bp;
+	char *bp;
 {
 
 	while (*bp && *bp != ':')
@@ -230,8 +230,8 @@ tskip(bp)
 tgetnum(id)
 	char *id;
 {
-	register int i, base;
-	register char *bp = tbuf;
+	int i, base;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -263,7 +263,7 @@ tgetnum(id)
 tgetflag(id)
 	char *id;
 {
-	register char *bp = tbuf;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -290,7 +290,7 @@ char *
 tgetstr(id, area)
 	char *id, **area;
 {
-	register char *bp = tbuf;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -313,11 +313,11 @@ tgetstr(id, area)
  */
 static char *
 tdecode(str, area)
-	register char *str;
+	char *str;
 	char **area;
 {
-	register char *cp;
-	register int c;
+	char *cp;
+	int c;
 	int i;
 
 	cp = *area;
diff --git a/usr.bin/vi/ex/ex_script.c b/usr.bin/vi/ex/ex_script.c
index a666909e90e..df7139b60cd 100644
--- a/usr.bin/vi/ex/ex_script.c
+++ b/usr.bin/vi/ex/ex_script.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_script.c,v 1.6 2001/07/09 07:04:57 deraadt Exp $	*/
+/*	$OpenBSD: ex_script.c,v 1.7 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -752,8 +752,8 @@ sscr_pty(amaster, aslave, name, termp, winp)
 	void *winp;
 {
 	static char line[] = "/dev/ptyXX";
-	register char *cp1, *cp2;
-	register int master, slave, ttygid;
+	char *cp1, *cp2;
+	int master, slave, ttygid;
 	struct group *gr;
 
 	if ((gr = getgrnam("tty")) != NULL)
diff --git a/usr.bin/vi/ex/ex_tag.c b/usr.bin/vi/ex/ex_tag.c
index 9890169d5f1..c6757ae18c5 100644
--- a/usr.bin/vi/ex/ex_tag.c
+++ b/usr.bin/vi/ex/ex_tag.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_tag.c,v 1.8 2001/01/29 01:58:44 niklas Exp $	*/
+/*	$OpenBSD: ex_tag.c,v 1.9 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -1252,9 +1252,9 @@ ctag_file(sp, tfp, name, dirp, dlenp)
 
 static char *
 binary_search(string, front, back)
-	register char *string, *front, *back;
+	char *string, *front, *back;
 {
-	register char *p;
+	char *p;
 
 	p = front + (back - front) / 2;
 	SKIP_PAST_NEWLINE(p, back);
@@ -1315,7 +1315,7 @@ linear_search(string, front, back)
  */
 static int
 compare(s1, s2, back)
-	register char *s1, *s2, *back;
+	char *s1, *s2, *back;
 {
 	for (; *s1 && s2 < back && (*s2 != '\t' && *s2 != ' '); ++s1, ++s2)
 		if (*s1 != *s2)
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 311ced827e0..7e8086fee07 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: foldit.c,v 1.2 1996/06/26 05:42:37 deraadt Exp $	*/
+/*	$OpenBSD: foldit.c,v 1.3 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: foldit.c,v 1.4 1994/12/20 16:13:02 jtc Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)foldit.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: foldit.c,v 1.2 1996/06/26 05:42:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: foldit.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -48,7 +48,7 @@ foldit(chunk, col, max)
 	char *chunk;
 	int col, max;
 {
-	register char *cp;
+	char *cp;
 
 	/*
 	 * Keep track of column position. Insert hidden newline
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index b09ebaa07c5..4c6d97c62eb 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vis.c,v 1.3 1997/01/15 23:43:33 millert Exp $	*/
+/*	$OpenBSD: vis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: vis.c,v 1.3 1997/01/15 23:43:33 millert Exp $";
+static char rcsid[] = "$OpenBSD: vis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -135,8 +135,8 @@ process(fp, filename)
 	char *filename;
 {
 	static int col = 0;
-	register char *cp = "\0"+1;	/* so *(cp-1) starts out != '\n' */
-	register int c, rachar; 
+	char *cp = "\0"+1;	/* so *(cp-1) starts out != '\n' */
+	int c, rachar; 
 	char buff[5];
 	
 	c = getc(fp);
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 20657024fbe..d644d77c28d 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
-/*	$OpenBSD: vmstat.c,v 1.61 2001/11/06 19:20:15 art Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.62 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1991, 1993
@@ -159,12 +159,12 @@ extern char *__progname;
 
 int
 main(argc, argv)
-	register int argc;
-	register char **argv;
+	int argc;
+	char **argv;
 {
 	extern int optind;
 	extern char *optarg;
-	register int c, todo;
+	int c, todo;
 	u_int interval;
 	int reps;
 	char errbuf[_POSIX2_LINE_MAX];
@@ -299,7 +299,7 @@ char **
 choosedrives(argv)
 	char **argv;
 {
-	register int i;
+	int i;
 
 	/*
 	 * Choose drives to be displayed.  Priority goes to (in order) drives
@@ -446,7 +446,7 @@ dovmstat(interval, reps)
 void
 printhdr()
 {
-	register int i;
+	int i;
 
 	(void)printf(" procs   memory       page%*s", 20, "");
 	if (ndrives > 0)
@@ -659,7 +659,7 @@ doforkst()
 void
 dkstats()
 {
-	register int dn, state;
+	int dn, state;
 	double etime;
 
 	/* Calculate disk stat deltas. */
@@ -681,7 +681,7 @@ dkstats()
 void
 cpustats()
 {
-	register int state;
+	int state;
 	double pct, total;
 
 	total = 0;
@@ -831,10 +831,10 @@ dointr()
 void
 dointr()
 {
-	register long *intrcnt, inttotal;
+	long *intrcnt, inttotal;
 	time_t uptime;
-	register int nintr, inamlen;
-	register char *intrname;
+	int nintr, inamlen;
+	char *intrname;
 	struct evcntlist allevents;
 	struct evcnt evcnt, *evptr;
 	struct device dev;
@@ -888,9 +888,9 @@ char *kmemnames[] = INITKMEMNAMES;
 void
 domem()
 {
-	register struct kmembuckets *kp;
-	register struct kmemstats *ks;
-	register int i, j;
+	struct kmembuckets *kp;
+	struct kmemstats *ks;
+	int i, j;
 	int len, size, first;
 	u_long totuse = 0, totfree = 0;
 	quad_t totreq = 0;
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index f7fd550c57b..16b03a7c1a2 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc_compare.c,v 1.4 2001/05/14 06:55:04 angelos Exp $	*/
+/*	$OpenBSD: proc_compare.c,v 1.5 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)proc_compare.c	8.2 (Berkeley) 9/23/93";
 #else
-static char *rcsid = "$OpenBSD: proc_compare.c,v 1.4 2001/05/14 06:55:04 angelos Exp $";
+static char *rcsid = "$OpenBSD: proc_compare.c,v 1.5 2001/11/19 19:02:17 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -74,7 +74,7 @@ static char *rcsid = "$OpenBSD: proc_compare.c,v 1.4 2001/05/14 06:55:04 angelos
 
 int
 proc_compare(p1, p2)
-	register struct proc *p1, *p2;
+	struct proc *p1, *p2;
 {
 	if (p1 == NULL)
 		return (1);
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 435f3afd5a4..859ad83907a 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttymsg.c,v 1.8 2001/09/04 23:44:19 millert Exp $	*/
+/*	$OpenBSD: ttymsg.c,v 1.9 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: ttymsg.c,v 1.3 1994/11/17 07:17:55 jtc Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
 #endif
-static const char rcsid[] = "$OpenBSD: ttymsg.c,v 1.8 2001/09/04 23:44:19 millert Exp $";
+static const char rcsid[] = "$OpenBSD: ttymsg.c,v 1.9 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -70,7 +70,7 @@ ttymsg(iov, iovcnt, line, tmout)
 {
 	static char device[MAXNAMLEN] = _PATH_DEV;
 	static char errbuf[1024];
-	register int cnt, fd, left, wret;
+	int cnt, fd, left, wret;
 	struct iovec localiov[6];
 	int forked = 0;
 	struct stat st;
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index ec885181607..796ed62a3fe 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wc.c,v 1.5 2001/07/12 05:17:31 deraadt Exp $	*/
+/*	$OpenBSD: wc.c,v 1.6 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*
  * Copyright (c) 1980, 1987, 1991, 1993
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)wc.c	8.2 (Berkeley) 5/2/95";
 #else
-static char rcsid[] = "$OpenBSD: wc.c,v 1.5 2001/07/12 05:17:31 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wc.c,v 1.6 2001/11/19 19:02:17 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -71,7 +71,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register int ch;
+	int ch;
 
 	setlocale(LC_ALL, "");
 
@@ -125,10 +125,10 @@ void
 cnt(file)
 	char *file;
 {
-	register u_char *C;
-	register short gotsp;
-	register int len;
-	register int64_t linect, wordct, charct;
+	u_char *C;
+	short gotsp;
+	int len;
+	int64_t linect, wordct, charct;
 	struct stat sbuf;
 	int fd;
 	u_char buf[MAXBSIZE];
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 60b0e6ddd8e..3ff87c58fa1 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: what.c,v 1.5 1999/08/16 19:57:37 art Exp $	*/
+/*	$OpenBSD: what.c,v 1.6 2001/11/19 19:02:17 mpech Exp $	*/
 /*	$NetBSD: what.c,v 1.4 1994/12/20 16:01:03 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)what.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: what.c,v 1.5 1999/08/16 19:57:37 art Exp $";
+static char rcsid[] = "$OpenBSD: what.c,v 1.6 2001/11/19 19:02:17 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -89,7 +89,7 @@ void
 search(match)
 	char *match;
 {
-	register int c;
+	int c;
 	int i;
 
 	while ((c = getchar()) != EOF) {
diff --git a/usr.bin/whatis/whatis.c b/usr.bin/whatis/whatis.c
index 32cbb818d1c..8f74ead0425 100644
--- a/usr.bin/whatis/whatis.c
+++ b/usr.bin/whatis/whatis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: whatis.c,v 1.5 2000/04/01 05:05:35 millert Exp $	*/
+/*	$OpenBSD: whatis.c,v 1.6 2001/11/19 19:02:17 mpech Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -137,7 +137,7 @@ whatis(argv, path, buildpath)
 	char **argv, *path;
 	int buildpath;
 {
-	register char *end, *name, **p;
+	char *end, *name, **p;
 	char buf[MAXLINELEN + 1], wbuf[MAXLINELEN + 1];
 	char hold[MAXPATHLEN];
 
@@ -180,10 +180,10 @@ whatis(argv, path, buildpath)
  */
 int
 match(bp, str)
-	register char *bp, *str;
+	char *bp, *str;
 {
-	register int len;
-	register char *start;
+	int len;
+	char *start;
 
 	if (!*str || !*bp)
 		return(0);
@@ -218,9 +218,9 @@ match(bp, str)
  */
 void
 dashtrunc(from, to)
-	register char *from, *to;
+	char *from, *to;
 {
-	register int ch;
+	int ch;
 
 	for (; (ch = *from) && ch != '\n' &&
 	    (ch != ' ' || from[1] != '-' || from[2] != ' '); ++from)
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 2ca1508355b..f39f954e1de 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: who.c,v 1.10 2001/01/31 17:42:26 deraadt Exp $	*/
+/*	$OpenBSD: who.c,v 1.11 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: who.c,v 1.4 1994/12/07 04:28:49 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)who.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: who.c,v 1.10 2001/01/31 17:42:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: who.c,v 1.11 2001/11/19 19:02:18 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -192,7 +192,7 @@ who_am_i(ufp)
 {
 	struct utmp usr;
 	struct passwd *pw;
-	register char *p;
+	char *p;
 	char *t;
 
 	/* search through the utmp and find an entry for this tty */
diff --git a/usr.bin/window/cmd.c b/usr.bin/window/cmd.c
index ae951e0996a..83edc70a0e0 100644
--- a/usr.bin/window/cmd.c
+++ b/usr.bin/window/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.5 2000/04/15 05:22:14 millert Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: cmd.c,v 1.4 1996/02/08 20:44:57 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: cmd.c,v 1.5 2000/04/15 05:22:14 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmd.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -50,8 +50,8 @@ static char rcsid[] = "$OpenBSD: cmd.c,v 1.5 2000/04/15 05:22:14 millert Exp $";
 
 docmd()
 {
-	register int c;
-	register struct ww *w;
+	int c;
+	struct ww *w;
 	char out = 0;
 
 	while (!out && !quit) {
@@ -222,7 +222,7 @@ docmd()
 struct ww *
 getwindow()
 {
-	register int c;
+	int c;
 	struct ww *w = 0;
 
 	if (!terse)
diff --git a/usr.bin/window/cmd1.c b/usr.bin/window/cmd1.c
index fa628b838f9..1223878fa3b 100644
--- a/usr.bin/window/cmd1.c
+++ b/usr.bin/window/cmd1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd1.c,v 1.4 1997/02/25 00:03:55 downsj Exp $	*/
+/*	$OpenBSD: cmd1.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: cmd1.c,v 1.4 1996/02/08 20:44:59 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd1.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: cmd1.c,v 1.4 1997/02/25 00:03:55 downsj Exp $";
+static char rcsid[] = "$OpenBSD: cmd1.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -117,7 +117,7 @@ c_window()
 }
 
 getpos(row, col, minrow, mincol, maxrow, maxcol)
-register int *row, *col;
+int *row, *col;
 int minrow, mincol;
 int maxrow, maxcol;
 {
diff --git a/usr.bin/window/cmd2.c b/usr.bin/window/cmd2.c
index b372e049d90..4885ad9ad66 100644
--- a/usr.bin/window/cmd2.c
+++ b/usr.bin/window/cmd2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd2.c,v 1.3 1997/02/25 00:03:56 downsj Exp $	*/
+/*	$OpenBSD: cmd2.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: cmd2.c,v 1.3 1995/09/28 10:34:05 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: cmd2.c,v 1.3 1997/02/25 00:03:56 downsj Exp $";
+static char rcsid[] = "$OpenBSD: cmd2.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -109,7 +109,7 @@ char *help_longcmd[] = {
 
 c_help()
 {
-	register struct ww *w;
+	struct ww *w;
 
 	if ((w = openiwin(wwnrow - 3, "Help")) == 0) {
 		error("Can't open help window: %s.", wwerror());
@@ -123,9 +123,9 @@ c_help()
 }
 
 help_print(w, name, list)
-register struct ww *w;
+struct ww *w;
 char *name;
-register char **list;
+char **list;
 {
 	wwprintf(w, "%s:\n\n", name);
 	while (*list)
diff --git a/usr.bin/window/cmd3.c b/usr.bin/window/cmd3.c
index 5b5a42d60cd..dcd0dd81bb8 100644
--- a/usr.bin/window/cmd3.c
+++ b/usr.bin/window/cmd3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd3.c,v 1.3 1997/02/25 00:03:57 downsj Exp $	*/
+/*	$OpenBSD: cmd3.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: cmd3.c,v 1.3 1995/09/28 10:34:07 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd3.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: cmd3.c,v 1.3 1997/02/25 00:03:57 downsj Exp $";
+static char rcsid[] = "$OpenBSD: cmd3.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,7 +49,7 @@ static char rcsid[] = "$OpenBSD: cmd3.c,v 1.3 1997/02/25 00:03:57 downsj Exp $";
 #include "string.h"
 
 setescape(esc)
-register char *esc;
+char *esc;
 {
 	if (*esc == '^') {
 		if (esc[1] != 0)
@@ -61,7 +61,7 @@ register char *esc;
 }
 
 setlabel(w, label)
-register struct ww *w;
+struct ww *w;
 char *label;
 {
 	if (w->ww_label != 0)
diff --git a/usr.bin/window/cmd5.c b/usr.bin/window/cmd5.c
index d8b232a145f..856a4b2a473 100644
--- a/usr.bin/window/cmd5.c
+++ b/usr.bin/window/cmd5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd5.c,v 1.3 1997/02/25 00:03:59 downsj Exp $	*/
+/*	$OpenBSD: cmd5.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: cmd5.c,v 1.3 1995/09/28 10:34:09 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd5.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: cmd5.c,v 1.3 1997/02/25 00:03:59 downsj Exp $";
+static char rcsid[] = "$OpenBSD: cmd5.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: cmd5.c,v 1.3 1997/02/25 00:03:59 downsj Exp $";
  */
 
 c_move(w)
-register struct ww *w;
+struct ww *w;
 {
 	int col, row;
 	int mincol, minrow;
@@ -96,7 +96,7 @@ register struct ww *w;
 }
 
 movewin(w, row, col)
-register struct ww *w;
+struct ww *w;
 {
 	struct ww *back = w->ww_back;
 
@@ -112,7 +112,7 @@ register struct ww *w;
  * Weird stufff, don't ask.
  */
 getminmax(x, n, a, b, curx, minx, maxx)
-register x, n, a, b;
+int x, n, a, b;
 int *curx, *minx, *maxx;
 {
 	if (x < 0)
diff --git a/usr.bin/window/cmd6.c b/usr.bin/window/cmd6.c
index 6902a71464e..a587a16e314 100644
--- a/usr.bin/window/cmd6.c
+++ b/usr.bin/window/cmd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd6.c,v 1.4 2000/04/15 05:22:14 millert Exp $	*/
+/*	$OpenBSD: cmd6.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: cmd6.c,v 1.3 1995/09/28 10:34:10 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd6.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: cmd6.c,v 1.4 2000/04/15 05:22:14 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmd6.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: cmd6.c,v 1.4 2000/04/15 05:22:14 millert Exp $"
 
 c_debug()
 {
-	register struct ww *w;
+	struct ww *w;
 
 	if (!terse)
 		wwputs("[m(smap) n(ns) o(os) s(string) v(nvis) w(win)]? ", cmdwin);
@@ -93,7 +93,7 @@ c_debug()
 #ifdef STR_DEBUG
 debug_str()
 {
-	register struct ww *w;
+	struct ww *w;
 	struct string *s;
 
 	if ((w = openiwin(wwnrow - 3, "Allocated Strings")) == 0) {
diff --git a/usr.bin/window/cmd7.c b/usr.bin/window/cmd7.c
index 611fd2aac50..d6af5008c05 100644
--- a/usr.bin/window/cmd7.c
+++ b/usr.bin/window/cmd7.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd7.c,v 1.3 1997/02/25 00:04:00 downsj Exp $	*/
+/*	$OpenBSD: cmd7.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: cmd7.c,v 1.3 1995/09/28 10:34:12 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd7.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: cmd7.c,v 1.3 1997/02/25 00:04:00 downsj Exp $";
+static char rcsid[] = "$OpenBSD: cmd7.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: cmd7.c,v 1.3 1997/02/25 00:04:00 downsj Exp $";
  */
 
 c_size(w)
-register struct ww *w;
+struct ww *w;
 {
 	int col, row;
 
diff --git a/usr.bin/window/compress.c b/usr.bin/window/compress.c
index 7d8ec3f5ce0..ad7ec846195 100644
--- a/usr.bin/window/compress.c
+++ b/usr.bin/window/compress.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compress.c,v 1.4 1998/04/26 22:49:04 millert Exp $	*/
+/*	$OpenBSD: compress.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: compress.c,v 1.3 1995/09/28 10:34:13 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)compress.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: compress.c,v 1.4 1998/04/26 22:49:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: compress.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -132,8 +132,8 @@ struct cc cc_q0a, cc_q0b, cc_q1a, cc_q1b;
 
 #define qinsert(p1, p2) \
 	do { \
-		register struct cc *forw = (p1)->qforw; \
-		register struct cc *back = (p1)->qback; \
+		struct cc *forw = (p1)->qforw; \
+		struct cc *back = (p1)->qback; \
 		back->qforw = forw; \
 		forw->qback = back; \
 		forw = (p2)->qforw; \
@@ -173,8 +173,8 @@ char *cc_tt_ob, *cc_tt_obe;
 
 ccinit()
 {
-	register i, j;
-	register struct cc *p;
+	int i, j;
+	struct cc *p;
 
 	if (tt.tt_token_max > cc_token_max)
 		tt.tt_token_max = cc_token_max;
@@ -310,7 +310,7 @@ ccstart()
 
 ccreset()
 {
-	register struct cc *p;
+	struct cc *p;
 
 	bzero((char *) cc_htab, HSIZE * sizeof *cc_htab);
 	for (p = cc_q0a.qforw; p != &cc_q0a; p = p->qforw)
@@ -368,8 +368,8 @@ cc_sweep_phase(buffer, bufsize, tokens)
 	char *buffer;
 	struct cc **tokens;
 {
-	register struct cc **pp = tokens;
-	register i, n;
+	struct cc **pp = tokens;
+	int i, n;
 #ifdef STATS
 	int nn, ii;
 #endif
@@ -424,11 +424,11 @@ cc_sweep_phase(buffer, bufsize, tokens)
 cc_sweep0(buffer, n, length)
 	char *buffer;
 {
-	register char *p;
-	register short *hc;
-	register i;
-	register short c;
-	register short pc = tt.tt_padc;
+	char *p;
+	short *hc;
+	int i;
+	short c;
+	short pc = tt.tt_padc;
 
 	/* n and length are at least 1 */
 	p = buffer++;
@@ -454,11 +454,11 @@ cc_sweep0(buffer, n, length)
 cc_sweep(buffer, bufsize, tokens, length)
 	char *buffer;
 	struct cc **tokens;
-	register length;
+	int length;
 {
-	register struct cc *p;
-	register char *cp;
-	register i;
+	struct cc *p;
+	char *cp;
+	int i;
 	short *hc;
 	short *places = cc_places[length];
 	struct cc **pp = tokens;
@@ -479,9 +479,9 @@ cc_sweep(buffer, bufsize, tokens, length)
 		struct cc **h;
 
 		{
-			register short *hc1 = hc;
-			register short c = *cp++;
-			register short hh;
+			short *hc1 = hc;
+			short c = *cp++;
+			short hh;
 			if ((hh = *hc1) < 0 || c == pc) {
 				*hc1++ = -1;
 				hc = hc1;
@@ -492,9 +492,9 @@ cc_sweep(buffer, bufsize, tokens, length)
 		}
 		for (p = *h; p != 0; p = p->hforw)
 			if (p->length == (char) length) {
-				register char *p1 = p->string;
-				register char *p2 = cp - length;
-				register n = length;
+				char *p1 = p->string;
+				char *p2 = cp - length;
+				int n = length;
 				do
 					if (*p1++ != *p2++)
 						goto fail;
@@ -511,9 +511,9 @@ cc_sweep(buffer, bufsize, tokens, length)
 				if ((*p->hback = p->hforw) != 0)
 					p->hforw->hback = p->hback;
 			{
-				register char *p1 = p->string;
-				register char *p2 = cp - length;
-				register n = length;
+				char *p1 = p->string;
+				char *p2 = cp - length;
+				int n = length;
 				do
 					*p1++ = *p2++;
 				while (--n);
@@ -628,11 +628,11 @@ cc_sweep(buffer, bufsize, tokens, length)
 }
 
 cc_sweep_reverse(pp, places)
-	register struct cc **pp;
-	register short *places;
+	struct cc **pp;
+	short *places;
 {
-	register struct cc *p;
-	register short front, back, t;
+	struct cc *p;
+	short front, back, t;
 
 	while ((p = *pp++) != 0) {
 		back = -1;
@@ -651,7 +651,7 @@ cc_compress_phase(output, bufsize, tokens, ntoken)
 	struct cc **output;
 	struct cc **tokens;
 {
-	register i;
+	int i;
 
 	bzero((char *) output, bufsize * sizeof *output);
 	for (i = 0; i < cc_npass0; i++)
@@ -662,12 +662,12 @@ cc_compress_phase(output, bufsize, tokens, ntoken)
 }
 
 cc_compress_phase1(output, tokens, ntoken, flag)
-	register struct cc **output;
+	struct cc **output;
 	struct cc **tokens;
 {
-	register struct cc **pp;
+	struct cc **pp;
 #ifdef STATS
-	register int i = 0;
+	int i = 0;
 	int nt = 0, cc = 0, nc = 0;
 #endif
 
@@ -713,15 +713,15 @@ cc_compress_phase1(output, tokens, ntoken, flag)
 }
 
 cc_compress_cleanup(output, bufsize)
-	register struct cc **output;
+	struct cc **output;
 {
-	register struct cc **end;
+	struct cc **end;
 
 	/* the previous output phase may have been interrupted */
 	qinsertq(&cc_q0b, &cc_q0a);
 	for (end = output + bufsize; output < end;) {
-		register struct cc *p;
-		register length;
+		struct cc *p;
+		int length;
 		if ((p = *output) == 0) {
 			output++;
 			continue;
@@ -753,7 +753,7 @@ cc_compress(output, tokens, flag)
 	char flag;
 {
 	struct cc **pp = tokens;
-	register struct cc *p = *pp++;
+	struct cc *p = *pp++;
 	int length = p->length;
 	int threshold = thresh(length);
 #ifndef cc_weight
@@ -765,7 +765,7 @@ cc_compress(output, tokens, flag)
 
 	do {
 		int score;
-		register struct cc_undo *undop;
+		struct cc_undo *undop;
 		int ccount;
 #ifdef STATS
 		int ncover;
@@ -790,10 +790,10 @@ cc_compress(output, tokens, flag)
 		ncover = 0;
 #endif
 		for (i = p->places; i >= 0; i = places[i]) {
-			register struct cc **jp;
-			register struct cc *x;
-			register struct cc **ip = output + i;
-			register score0 = initial_score0;
+			struct cc **jp;
+			struct cc *x;
+			struct cc **ip = output + i;
+			int score0 = initial_score0;
 			struct cc **iip = ip + length;
 			struct cc_undo *undop1 = undop;
 
@@ -848,9 +848,9 @@ cc_compress(output, tokens, flag)
 #endif
 			p->ccount = ccount;
 		} else {
-			register struct cc_undo *u = cc_undo;
+			struct cc_undo *u = cc_undo;
 			while (--undop >= u) {
-				register struct cc *x;
+				struct cc *x;
 				if (*undop->pos = x = undop->val)
 					x->ccount++;
 			}
@@ -860,12 +860,12 @@ cc_compress(output, tokens, flag)
 }
 
 cc_output_phase(buffer, output, bufsize)
-	register char *buffer;
-	register struct cc **output;
-	register bufsize;
+	char *buffer;
+	struct cc **output;
+	int bufsize;
 {
-	register i;
-	register struct cc *p, *p1;
+	int i;
+	struct cc *p, *p1;
 
 	for (i = 0; i < bufsize;) {
 		if ((p = output[i]) == 0) {
diff --git a/usr.bin/window/context.c b/usr.bin/window/context.c
index d9925413b86..a86468e61ca 100644
--- a/usr.bin/window/context.c
+++ b/usr.bin/window/context.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: context.c,v 1.3 1997/02/25 00:04:02 downsj Exp $	*/
+/*	$OpenBSD: context.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: context.c,v 1.3 1995/09/28 10:34:15 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)context.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: context.c,v 1.3 1997/02/25 00:04:02 downsj Exp $";
+static char rcsid[] = "$OpenBSD: context.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -58,7 +58,7 @@ char *malloc();
 
 cx_alloc()
 {
-	register struct context *xp;
+	struct context *xp;
 
 	if (cx.x_type != 0) {
 		xp = (struct context *)
diff --git a/usr.bin/window/error.c b/usr.bin/window/error.c
index 5ce307ead85..959a98b8141 100644
--- a/usr.bin/window/error.c
+++ b/usr.bin/window/error.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: error.c,v 1.4 1998/03/17 04:11:53 deraadt Exp $	*/
+/*	$OpenBSD: error.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: error.c,v 1.3 1995/09/28 10:34:20 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)error.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: error.c,v 1.4 1998/03/17 04:11:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -56,8 +56,8 @@ static char rcsid[] = "$OpenBSD: error.c,v 1.4 1998/03/17 04:11:53 deraadt Exp $
 error(fmt, a, b, c, d, e, f, g, h)
 char *fmt;
 {
-	register struct context *x;
-	register struct ww *w;
+	struct context *x;
+	struct ww *w;
 
 	for (x = &cx; x != 0 && x->x_type != X_FILE; x = x->x_link)
 		;
diff --git a/usr.bin/window/lcmd.c b/usr.bin/window/lcmd.c
index d3e69952fd3..5913c1b7555 100644
--- a/usr.bin/window/lcmd.c
+++ b/usr.bin/window/lcmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcmd.c,v 1.3 1997/02/25 00:04:05 downsj Exp $	*/
+/*	$OpenBSD: lcmd.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: lcmd.c,v 1.3 1995/09/28 10:34:21 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lcmd.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lcmd.c,v 1.3 1997/02/25 00:04:05 downsj Exp $";
+static char rcsid[] = "$OpenBSD: lcmd.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -128,7 +128,7 @@ struct lcmd_tab *
 lcmd_lookup(name)
 char *name;
 {
-	register struct lcmd_tab *p;
+	struct lcmd_tab *p;
 
 	for (p = lcmd_tab; p->lc_name != 0; p++)
 		if (str_match(name, p->lc_name, p->lc_minlen))
diff --git a/usr.bin/window/lcmd1.c b/usr.bin/window/lcmd1.c
index 683eb2b04fd..0222c1d33ee 100644
--- a/usr.bin/window/lcmd1.c
+++ b/usr.bin/window/lcmd1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcmd1.c,v 1.5 1997/02/25 00:04:07 downsj Exp $	*/
+/*	$OpenBSD: lcmd1.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: lcmd1.c,v 1.6 1996/02/08 20:45:00 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lcmd1.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lcmd1.c,v 1.5 1997/02/25 00:04:07 downsj Exp $";
+static char rcsid[] = "$OpenBSD: lcmd1.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,7 @@ struct lcmd_arg arg_window[] = {
 
 l_window(v, a)
 struct value *v;
-register struct value *a;
+struct value *a;
 {
 	struct ww *w;
 	int col, row, ncol, nrow, id, nline;
@@ -78,7 +78,7 @@ register struct value *a;
 	int haspty, hasframe, mapnl, keepopen, smooth;
 	char *shf, **sh;
 	char *argv[sizeof default_shell / sizeof *default_shell];
-	register char **pp;
+	char **pp;
 
 	if ((id = findid()) < 0)
 		return;
@@ -143,7 +143,7 @@ struct lcmd_arg arg_def_nline[] = {
 };
 
 l_def_nline(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	v->v_num = default_nline;
 	v->v_type = V_NUM;
@@ -158,7 +158,7 @@ struct lcmd_arg arg_smooth[] = {
 };
 
 l_smooth(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	struct ww *w;
 
@@ -179,7 +179,7 @@ struct lcmd_arg arg_def_smooth[] = {
 };
 
 l_def_smooth(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	v->v_type = V_NUM;
 	v->v_num = default_smooth;
@@ -192,7 +192,7 @@ struct lcmd_arg arg_select[] = {
 };
 
 l_select(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	struct ww *w;
 
@@ -211,7 +211,7 @@ struct lcmd_arg arg_debug[] = {
 };
 
 l_debug(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	v->v_type = V_NUM;
 	v->v_num = debug;
@@ -224,7 +224,7 @@ struct lcmd_arg arg_escape[] = {
 };
 
 l_escape(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	char buf[2];
 
@@ -248,7 +248,7 @@ struct lcmd_arg arg_label[] = {
 /*ARGSUSED*/
 l_label(v, a)
 struct value *v;
-register struct value *a;
+struct value *a;
 {
 	struct ww *w;
 
@@ -266,7 +266,7 @@ struct lcmd_arg arg_foreground[] = {
 };
 
 l_foreground(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	struct ww *w;
 	char flag;
@@ -289,7 +289,7 @@ struct lcmd_arg arg_terse[] = {
 };
 
 l_terse(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	v->v_type = V_NUM;
 	v->v_num = terse;
@@ -302,7 +302,7 @@ struct lcmd_arg arg_source[] = {
 };
 
 l_source(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	v->v_type = V_NUM;
 	if (a->v_type != V_ERR && dosource(a->v_str) < 0) {
@@ -321,7 +321,7 @@ struct lcmd_arg arg_write[] = {
 /*ARGSUSED*/
 l_write(v, a)
 struct value *v;
-register struct value *a;
+struct value *a;
 {
 	char buf[20];
 	struct ww *w;
@@ -347,7 +347,7 @@ struct lcmd_arg arg_close[] = {
 /*ARGSUSED*/
 l_close(v, a)
 struct value *v;
-register struct value *a;
+struct value *a;
 {
 	struct ww *w;
 
@@ -365,7 +365,7 @@ struct lcmd_arg arg_cursormodes[] = {
 };
 
 l_cursormodes(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 
 	v->v_type = V_NUM;
@@ -380,7 +380,7 @@ struct lcmd_arg arg_unset[] = {
 };
 
 l_unset(v, a)
-register struct value *v, *a;
+struct value *v, *a;
 {
 	v->v_type = V_NUM;
 	switch (a->v_type) {
@@ -401,7 +401,7 @@ register struct value *v, *a;
 
 struct ww *
 vtowin(v, w)
-register struct value *v;
+struct value *v;
 struct ww *w;
 {
 	switch (v->v_type) {
@@ -423,7 +423,7 @@ struct ww *w;
 }
 
 vtobool(v, def, err)
-register struct value *v;
+struct value *v;
 char def, err;
 {
 	switch (v->v_type) {
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index e7eb4684734..b131c2e9360 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcmd2.c,v 1.4 1997/02/25 00:04:08 downsj Exp $	*/
+/*	$OpenBSD: lcmd2.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: lcmd2.c,v 1.7 1995/09/29 00:44:04 cgd Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lcmd2.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.4 1997/02/25 00:04:08 downsj Exp $";
+static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.4 1997/02/25 00:04:08 downsj Exp $"
 l_iostat(v, a)
 struct value *v, *a;
 {
-	register struct ww *w;
+	struct ww *w;
 
 	if ((w = openiwin(16, "IO Statistics")) == 0) {
 		error("Can't open statistics window: %s.", wwerror());
@@ -111,9 +111,9 @@ struct lcmd_arg arg_time[] = {
 /*ARGSUSED*/
 l_time(v, a)
 struct value *v;
-register struct value *a;
+struct value *a;
 {
-	register struct ww *w;
+	struct ww *w;
 	struct rusage rusage;
 	struct timeval timeval;
 	char *strtime();
@@ -154,11 +154,11 @@ register struct value *a;
 
 char *
 strtime(t)
-register struct timeval *t;
+struct timeval *t;
 {
 	char fill = 0;
 	static char buf[20];
-	register char *p = buf;
+	char *p = buf;
 
 	if (t->tv_sec > 60*60) {
 		(void) sprintf(p, "%ld:", t->tv_sec / (60*60));
@@ -185,8 +185,8 @@ register struct timeval *t;
 l_list(v, a)
 struct value *v, *a;
 {
-	register struct ww *w, *wp;
-	register i;
+	struct ww *w, *wp;
+	int i;
 	int n;
 
 	for (n = 0, i = 0; i < NWINDOW; i++)
@@ -218,7 +218,7 @@ struct value *v, *a;
 l_variable(v, a)
 struct value *v, *a;
 {
-	register struct ww *w;
+	struct ww *w;
 	int printvar();
 
 	if ((w = openiwin(wwnrow - 3, "Variables")) == 0) {
@@ -231,8 +231,8 @@ struct value *v, *a;
 }
 
 printvar(w, r)
-register struct ww *w;
-register struct var *r;
+struct ww *w;
+struct var *r;
 {
 	if (more(w, 0) == 2)
 		return -1;
@@ -259,8 +259,8 @@ struct lcmd_arg arg_def_shell[] = {
 l_def_shell(v, a)
 	struct value *v, *a;
 {
-	register char **pp;
-	register struct value *vp;
+	char **pp;
+	struct value *vp;
 
 	if (a->v_type == V_ERR) {
 		if ((v->v_str = str_cpy(default_shellfile)) != 0)
@@ -301,7 +301,7 @@ l_alias(v, a)
 	struct value *v, *a;
 {
 	if (a->v_type == V_ERR) {
-		register struct ww *w;
+		struct ww *w;
 		int printalias();
 
 		if ((w = openiwin(wwnrow - 3, "Aliases")) == 0) {
@@ -312,7 +312,7 @@ l_alias(v, a)
 			waitnl(w);
 		closeiwin(w);
 	} else {
-		register struct alias *ap = 0;
+		struct alias *ap = 0;
 
 		if (ap = alias_lookup(a->v_str)) {
 			if ((v->v_str = str_cpy(ap->a_buf)) == 0) {
@@ -322,10 +322,10 @@ l_alias(v, a)
 			v->v_type = V_STR;
 		}
 		if (a[1].v_type == V_STR) {
-			register struct value *vp;
-			register char *p, *q;
+			struct value *vp;
+			char *p, *q;
 			char *str;
-			register n;
+			int n;
 
 			for (n = 0, vp = a + 1; vp->v_type != V_ERR; vp++, n++)
 				for (p = vp->v_str; *p; p++, n++)
@@ -350,8 +350,8 @@ l_alias(v, a)
 }
 
 printalias(w, a)
-register struct ww *w;
-register struct alias *a;
+struct ww *w;
+struct alias *a;
 {
 	if (more(w, 0) == 2)
 		return -1;
@@ -381,7 +381,7 @@ struct lcmd_arg arg_echo[] = {
 /*ARGSUSED*/
 l_echo(v, a)
 struct value *v;
-register struct value *a;
+struct value *a;
 {
 	char buf[20];
 	struct ww *w;
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index aa3c8d28fd5..4479b9b6c6e 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.6 1997/02/25 00:04:09 downsj Exp $	*/
+/*	$OpenBSD: main.c,v 1.7 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: main.c,v 1.6 1996/02/08 20:45:01 mycroft Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.6 1997/02/25 00:04:09 downsj Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.7 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -66,7 +66,7 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.6 1997/02/25 00:04:09 downsj Exp $";
 main(argc, argv)
 char **argv;
 {
-	register char *p;
+	char *p;
 	char fflag = 0;
 	char dflag = 0;
 	char xflag = 0;
diff --git a/usr.bin/window/mloop.c b/usr.bin/window/mloop.c
index 95c213e8d02..0ee7373a422 100644
--- a/usr.bin/window/mloop.c
+++ b/usr.bin/window/mloop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mloop.c,v 1.5 1997/02/25 00:04:10 downsj Exp $	*/
+/*	$OpenBSD: mloop.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: mloop.c,v 1.5 1996/02/08 20:45:03 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)mloop.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: mloop.c,v 1.5 1997/02/25 00:04:10 downsj Exp $";
+static char rcsid[] = "$OpenBSD: mloop.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -61,9 +61,9 @@ mloop()
 				(void) wwgetc();
 			error("Process died.");
 		} else {
-			register struct ww *w = wwcurwin;
-			register char *p;
-			register n;
+			struct ww *w = wwcurwin;
+			char *p;
+			int n;
 
 			if (wwibp >= wwibq) {
 				wwibp = wwibq = wwib;
diff --git a/usr.bin/window/parser1.c b/usr.bin/window/parser1.c
index 9bc1e3e281c..3f83e36df51 100644
--- a/usr.bin/window/parser1.c
+++ b/usr.bin/window/parser1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser1.c,v 1.3 1997/02/25 00:04:11 downsj Exp $	*/
+/*	$OpenBSD: parser1.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: parser1.c,v 1.3 1995/09/28 10:34:31 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)parser1.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: parser1.c,v 1.3 1997/02/25 00:04:11 downsj Exp $";
+static char rcsid[] = "$OpenBSD: parser1.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -191,7 +191,7 @@ char flag;
 }
 
 p_convstr(v)
-register struct value *v;
+struct value *v;
 {
 	if (v->v_type != V_NUM)
 		return 0;
diff --git a/usr.bin/window/parser2.c b/usr.bin/window/parser2.c
index f8e5b13f433..b29f19f813b 100644
--- a/usr.bin/window/parser2.c
+++ b/usr.bin/window/parser2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser2.c,v 1.3 1997/02/25 00:04:12 downsj Exp $	*/
+/*	$OpenBSD: parser2.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: parser2.c,v 1.3 1995/09/28 10:34:32 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)parser2.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: parser2.c,v 1.3 1997/02/25 00:04:12 downsj Exp $";
+static char rcsid[] = "$OpenBSD: parser2.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -56,16 +56,16 @@ static char rcsid[] = "$OpenBSD: parser2.c,v 1.3 1997/02/25 00:04:12 downsj Exp
  */
 p_function(name, v, flag)
 char *name;
-register struct value *v;
+struct value *v;
 {
 	struct value t;
-	register struct lcmd_tab *c = 0;
-	register struct alias *a = 0;
-	register struct lcmd_arg *ap;		/* this arg */
+	struct lcmd_tab *c = 0;
+	struct alias *a = 0;
+	struct lcmd_arg *ap;			/* this arg */
 	struct lcmd_arg *lp = 0;		/* list arg */
-	register i;
+	int i;
 	struct value av[LCMD_NARG + 1];
-	register struct value *vp;
+	struct value *vp;
 
 	if (name != 0)
 		if (c = lcmd_lookup(name))
diff --git a/usr.bin/window/parser3.c b/usr.bin/window/parser3.c
index f7b1c9685bb..e8fde0dc689 100644
--- a/usr.bin/window/parser3.c
+++ b/usr.bin/window/parser3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser3.c,v 1.3 1997/02/25 00:04:13 downsj Exp $	*/
+/*	$OpenBSD: parser3.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: parser3.c,v 1.3 1995/09/28 10:34:33 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)parser3.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: parser3.c,v 1.3 1997/02/25 00:04:13 downsj Exp $";
+static char rcsid[] = "$OpenBSD: parser3.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: parser3.c,v 1.3 1997/02/25 00:04:13 downsj Exp
  * unary - + ~ !
  */
 p_expr(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	struct value t;
@@ -93,7 +93,7 @@ char flag;
  * ? :
  */
 p_expr0(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	struct value t;
@@ -132,7 +132,7 @@ char flag;
  * ||
  */
 p_expr1(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	char true = 0;
@@ -166,7 +166,7 @@ char flag;
  * &&
  */
 p_expr2(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	char true = 1;
diff --git a/usr.bin/window/parser4.c b/usr.bin/window/parser4.c
index 1b61b6b6da8..1f0cb44cb46 100644
--- a/usr.bin/window/parser4.c
+++ b/usr.bin/window/parser4.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser4.c,v 1.3 1997/02/25 00:04:14 downsj Exp $	*/
+/*	$OpenBSD: parser4.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: parser4.c,v 1.5 1995/09/29 00:44:05 cgd Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)parser4.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: parser4.c,v 1.3 1997/02/25 00:04:14 downsj Exp $";
+static char rcsid[] = "$OpenBSD: parser4.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ static char rcsid[] = "$OpenBSD: parser4.c,v 1.3 1997/02/25 00:04:14 downsj Exp
  * * / %	10
  */
 p_expr3_10(level, v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	struct value l, r;
diff --git a/usr.bin/window/parser5.c b/usr.bin/window/parser5.c
index d4ff123f5a9..52bc98f6ebd 100644
--- a/usr.bin/window/parser5.c
+++ b/usr.bin/window/parser5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser5.c,v 1.3 1997/02/25 00:04:15 downsj Exp $	*/
+/*	$OpenBSD: parser5.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: parser5.c,v 1.3 1995/09/28 10:34:35 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)parser5.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: parser5.c,v 1.3 1997/02/25 00:04:15 downsj Exp $";
+static char rcsid[] = "$OpenBSD: parser5.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: parser5.c,v 1.3 1997/02/25 00:04:15 downsj Exp
  * unary $ $? + - ! ~
  */
 p_expr11(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	int op;
@@ -154,7 +154,7 @@ char flag;
  * Always return v_type == V_ERR when flag == 0.
  */
 p_expr12(v, flag)
-register struct value *v;
+struct value *v;
 char flag;
 {
 	v->v_type = V_ERR;
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index f9d681b9621..1012c2f49ef 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scanner.c,v 1.3 1997/02/25 00:04:16 downsj Exp $	*/
+/*	$OpenBSD: scanner.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: scanner.c,v 1.3 1995/09/28 10:34:36 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)scanner.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: scanner.c,v 1.3 1997/02/25 00:04:16 downsj Exp $";
+static char rcsid[] = "$OpenBSD: scanner.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: scanner.c,v 1.3 1997/02/25 00:04:16 downsj Exp
 
 s_getc()
 {
-	register c;
+	int c;
 
 	switch (cx.x_type) {
 	case X_FILE:
@@ -93,9 +93,9 @@ s_ungetc(c)
 s_gettok()
 {
 	char buf[100];
-	register char *p = buf;
-	register c;
-	register state = 0;
+	char *p = buf;
+	int c;
+	int state = 0;
 
 loop:
 	c = s_getc();
@@ -538,8 +538,8 @@ loop:
 
 s_gettok1()
 {
-	register c;
-	register n;
+	int c;
+	int n;
 
 	c = s_getc();			/* got \ */
 	switch (c) {
diff --git a/usr.bin/window/startup.c b/usr.bin/window/startup.c
index a747de6f29c..58906d4ba88 100644
--- a/usr.bin/window/startup.c
+++ b/usr.bin/window/startup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: startup.c,v 1.5 2000/08/02 04:10:50 millert Exp $	*/
+/*	$OpenBSD: startup.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: startup.c,v 1.4 1996/02/08 20:45:04 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)startup.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: startup.c,v 1.5 2000/08/02 04:10:50 millert Exp $";
+static char rcsid[] = "$OpenBSD: startup.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,7 +72,7 @@ doconfig()
 dodefault()
 {
 	struct ww *w;
-	register r = wwnrow / 2 - 1;
+	int r = wwnrow / 2 - 1;
 
 	if (openwin(1, r + 2, 0, wwnrow - r - 2, wwncol, default_nline,
 	    (char *) 0, WWT_PTY, WWU_HASFRAME, default_shellfile,
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c
index 7a5e3cf4ceb..c70fede0ce8 100644
--- a/usr.bin/window/string.c
+++ b/usr.bin/window/string.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: string.c,v 1.4 1998/04/26 22:49:06 millert Exp $	*/
+/*	$OpenBSD: string.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: string.c,v 1.5 1995/09/29 00:44:06 cgd Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)string.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: string.c,v 1.4 1998/04/26 22:49:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: string.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -51,10 +51,10 @@ static char rcsid[] = "$OpenBSD: string.c,v 1.4 1998/04/26 22:49:06 millert Exp
 
 char *
 str_cpy(s)
-register char *s;
+char *s;
 {
 	char *str;
-	register char *p;
+	char *p;
 
 	str = p = str_alloc(strlen(s) + 1);
 	if (p == 0)
@@ -66,12 +66,12 @@ register char *s;
 
 char *
 str_ncpy(s, n)
-register char *s;
-register n;
+char *s;
+int n;
 {
 	int l = strlen(s);
 	char *str;
-	register char *p;
+	char *p;
 
 	if (n > l)
 		n = l;
@@ -99,7 +99,7 @@ str_cat(s1, s2)
 char *s1, *s2;
 {
 	char *str;
-	register char *p, *q;
+	char *p, *q;
 
 	str = p = str_alloc(strlen(s1) + strlen(s2) + 1);
 	if (p == 0)
@@ -116,8 +116,8 @@ char *s1, *s2;
  * s can be a prefix of p with at least min characters.
  */
 str_match(s, p, min)
-register char *s, *p;
-register min;
+char *s, *p;
+int min;
 {
 	for (; *s && *p && *s == *p; s++, p++, min--)
 		;
@@ -129,7 +129,7 @@ char *
 str_alloc(l)
 int l;
 {
-	register struct string *s;
+	struct string *s;
 
 	s = (struct string *) malloc(l + str_offset);
 	if (s == 0)
@@ -146,7 +146,7 @@ int l;
 str_free(str)
 char *str;
 {
-	register struct string *s;
+	struct string *s;
 
 	for (s = str_head.s_forw; s != &str_head && s->s_data != str;
 	     s = s->s_forw)
diff --git a/usr.bin/window/ttgeneric.c b/usr.bin/window/ttgeneric.c
index fba09acdada..32faf547a8d 100644
--- a/usr.bin/window/ttgeneric.c
+++ b/usr.bin/window/ttgeneric.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttgeneric.c,v 1.3 1997/02/25 00:04:22 downsj Exp $	*/
+/*	$OpenBSD: ttgeneric.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: ttgeneric.c,v 1.3 1995/09/28 10:34:45 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)ttgeneric.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: ttgeneric.c,v 1.3 1997/02/25 00:04:22 downsj Exp $";
+static char rcsid[] = "$OpenBSD: ttgeneric.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -139,9 +139,9 @@ char new;
 }
 
 gen_setmodes(new)
-register new;
+int new;
 {
-	register diff;
+	int diff;
 
 	diff = new ^ tt.tt_modes;
 	if (diff & WWM_REV) {
@@ -202,7 +202,7 @@ gen_delline(n)
 }
 
 gen_putc(c)
-register char c;
+char c;
 {
 	if (tt.tt_insert)
 		gen_setinsert(0);
@@ -219,8 +219,8 @@ register char c;
 }
 
 gen_write(p, n)
-	register char *p;
-	register n;
+	char *p;
+	int n;
 {
 	if (tt.tt_insert)
 		gen_setinsert(0);
@@ -238,7 +238,7 @@ gen_write(p, n)
 }
 
 gen_move(row, col)
-register int row, col;
+int row, col;
 {
 	if (tt.tt_row == row && tt.tt_col == col)
 		return;
@@ -330,7 +330,7 @@ gen_clear()
 }
 
 gen_inschar(c)
-register char c;
+char c;
 {
 	if (!tt.tt_insert)
 		gen_setinsert(1);
diff --git a/usr.bin/window/tth19.c b/usr.bin/window/tth19.c
index 7f76b7f4af8..e94367fc3c1 100644
--- a/usr.bin/window/tth19.c
+++ b/usr.bin/window/tth19.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tth19.c,v 1.3 1997/02/25 00:04:22 downsj Exp $	*/
+/*	$OpenBSD: tth19.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: tth19.c,v 1.3 1995/09/28 10:34:47 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)tth19.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: tth19.c,v 1.3 1997/02/25 00:04:22 downsj Exp $";
+static char rcsid[] = "$OpenBSD: tth19.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -78,7 +78,7 @@ extern struct tt_str *gen_VE;
 int h19_msp10c;
 
 #define PAD(ms10) { \
-	register i; \
+	int i; \
 	for (i = ((ms10) + 5) / h19_msp10c; --i >= 0;) \
 		ttputc('\0'); \
 }
@@ -88,9 +88,9 @@ int h19_msp10c;
 #define H19_SETINSERT(m) ttesc((tt.tt_insert = (m)) ? '@' : 'O')
 
 h19_setmodes(new)
-register new;
+int new;
 {
-	register diff;
+	int diff;
 
 	diff = new ^ tt.tt_modes;
 	if (diff & WWM_REV)
@@ -117,7 +117,7 @@ h19_delline(n)
 }
 
 h19_putc(c)
-register char c;
+char c;
 {
 	if (tt.tt_nmodes != tt.tt_modes)
 		(*tt.tt_setmodes)(tt.tt_nmodes);
@@ -129,8 +129,8 @@ register char c;
 }
 
 h19_write(p, n)
-register char *p;
-register n;
+char *p;
+int n;
 {
 	if (tt.tt_nmodes != tt.tt_modes)
 		(*tt.tt_setmodes)(tt.tt_nmodes);
@@ -143,7 +143,7 @@ register n;
 }
 
 h19_move(row, col)
-register char row, col;
+char row, col;
 {
 	if (tt.tt_row == row) {
 		if (tt.tt_col == col)
@@ -219,7 +219,7 @@ h19_clear()
 }
 
 h19_inschar(c)
-register char c;
+char c;
 {
 	if (tt.tt_nmodes != tt.tt_modes)
 		(*tt.tt_setmodes)(tt.tt_nmodes);
diff --git a/usr.bin/window/tth29.c b/usr.bin/window/tth29.c
index b912ac31474..5f046a8ecc1 100644
--- a/usr.bin/window/tth29.c
+++ b/usr.bin/window/tth29.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tth29.c,v 1.3 1997/02/25 00:04:23 downsj Exp $	*/
+/*	$OpenBSD: tth29.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: tth29.c,v 1.3 1995/09/28 10:34:48 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)tth29.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: tth29.c,v 1.3 1997/02/25 00:04:23 downsj Exp $";
+static char rcsid[] = "$OpenBSD: tth29.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -66,9 +66,9 @@ kC|h29|heath-29|z29|zenith-29:\
  */
 
 h29_setmodes(new)
-register new;
+int new;
 {
-	register modes = '0';
+	int modes = '0';
 
 	if (new & WWM_REV)
 		modes += 0x01;
diff --git a/usr.bin/window/ttinit.c b/usr.bin/window/ttinit.c
index 36da770cf60..640dbae420b 100644
--- a/usr.bin/window/ttinit.c
+++ b/usr.bin/window/ttinit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttinit.c,v 1.8 2001/02/05 01:57:50 deraadt Exp $	*/
+/*	$OpenBSD: ttinit.c,v 1.9 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: ttinit.c,v 1.3 1995/09/28 10:34:50 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)ttinit.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: ttinit.c,v 1.8 2001/02/05 01:57:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ttinit.c,v 1.9 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -76,9 +76,9 @@ struct tt_tab tt_tab[] = {
 ttinit()
 {
 	int i;
-	register struct tt_tab *tp;
-	register char *p, *q;
-	register char *t;
+	struct tt_tab *tp;
+	char *p, *q;
+	char *t;
 
 	tt_strp = tt_strings;
 
diff --git a/usr.bin/window/ttoutput.c b/usr.bin/window/ttoutput.c
index 1b62364cea5..93bb66f0dcd 100644
--- a/usr.bin/window/ttoutput.c
+++ b/usr.bin/window/ttoutput.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttoutput.c,v 1.3 1997/02/25 00:04:25 downsj Exp $	*/
+/*	$OpenBSD: ttoutput.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: ttoutput.c,v 1.3 1995/09/28 10:34:51 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)ttoutput.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: ttoutput.c,v 1.3 1997/02/25 00:04:25 downsj Exp $";
+static char rcsid[] = "$OpenBSD: ttoutput.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -56,8 +56,8 @@ static char rcsid[] = "$OpenBSD: ttoutput.c,v 1.3 1997/02/25 00:04:25 downsj Exp
 
 ttflush()
 {
-	register char *p;
-	register n = tt_obp - tt_ob;
+	char *p;
+	int n = tt_obp - tt_ob;
 	extern errno;
 
 	if (n == 0)
@@ -90,15 +90,15 @@ ttflush()
 }
 
 ttputs(s)
-register char *s;
+char *s;
 {
 	while (*s)
 		ttputc(*s++);
 }
 
 ttwrite(s, n)
-	register char *s;
-	register n;
+	char *s;
+	int n;
 {
 	switch (n) {
 	case 0:
@@ -138,7 +138,7 @@ ttwrite(s, n)
 		break;
 	default:
 		while (n > 0) {
-			register m;
+			int m;
 
 			while ((m = tt_obe - tt_obp) == 0)
 				ttflush();
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index ec54aabd7f3..956985da3ed 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tttermcap.c,v 1.3 1997/02/25 00:04:25 downsj Exp $	*/
+/*	$OpenBSD: tttermcap.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: tttermcap.c,v 1.3 1995/09/28 10:34:52 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)tttermcap.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: tttermcap.c,v 1.3 1997/02/25 00:04:25 downsj Exp $";
+static char rcsid[] = "$OpenBSD: tttermcap.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -65,7 +65,7 @@ struct tt_str *
 tttgetstr(str)
 	char *str;
 {
-	register struct tt_str *s;
+	struct tt_str *s;
 
 	if ((str = tgetstr(str, &tt_strp)) == 0)
 		return 0;
@@ -80,7 +80,7 @@ struct tt_str *
 ttxgetstr(str)
 	char *str;
 {
-	register struct tt_str *s;
+	struct tt_str *s;
 	char buf[100];
 	char *bufp = buf;
 
@@ -98,7 +98,7 @@ ttxgetstr(str)
 tttgoto(s, col, row)
 	struct tt_str *s;
 {
-	register char *p = s->ts_str;
+	char *p = s->ts_str;
 
 	ttputs(tgoto(p, col, row));
 	for (p += s->ts_n; *--p == 0;)
@@ -113,7 +113,7 @@ ttpgoto(s, col, row, n)
 }
 
 ttstrcmp(a, b)
-	register struct tt_str *a, *b;
+	struct tt_str *a, *b;
 {
 	int n, r;
 
diff --git a/usr.bin/window/ttzapple.c b/usr.bin/window/ttzapple.c
index 917b4b5c900..468487fdc57 100644
--- a/usr.bin/window/ttzapple.c
+++ b/usr.bin/window/ttzapple.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttzapple.c,v 1.3 1997/02/25 00:04:28 downsj Exp $	*/
+/*	$OpenBSD: ttzapple.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: ttzapple.c,v 1.3 1995/09/28 10:34:57 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)ttzapple.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: ttzapple.c,v 1.3 1997/02/25 00:04:28 downsj Exp $";
+static char rcsid[] = "$OpenBSD: ttzapple.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -116,8 +116,8 @@ zz_putc(c)
 }
 
 zz_write(p, n)
-	register char *p;
-	register n;
+	char *p;
+	int n;
 {
 	if (tt.tt_nmodes != tt.tt_modes)
 		zz_setmodes(tt.tt_nmodes);
@@ -128,9 +128,9 @@ zz_write(p, n)
 }
 
 zz_move(row, col)
-	register row, col;
+	int row, col;
 {
-	register x;
+	int x;
 
 	if (tt.tt_row == row) {
 same_row:
@@ -364,13 +364,13 @@ zz_put_token(t, s, n)
 zz_rint(p, n)
 	char *p;
 {
-	register i;
-	register char *q;
+	int i;
+	char *q;
 
 	if (!zz_ecc)
 		return n;
 	for (i = n, q = p; --i >= 0;) {
-		register c = (unsigned char) *p++;
+		int c = (unsigned char) *p++;
 
 		if (zz_lastc == 0) {
 			switch (c) {
@@ -418,11 +418,11 @@ zz_rint(p, n)
 }
 
 zz_checksum(p, n)
-	register char *p;
-	register n;
+	char *p;
+	int n;
 {
 	while (--n >= 0) {
-		register c = *p++ & 0x7f;
+		int c = *p++ & 0x7f;
 		c ^= zz_sum;
 		zz_sum = c << 1 | c >> 11 & 1;
 	}
diff --git a/usr.bin/window/var.c b/usr.bin/window/var.c
index bf5bd128414..b205f6bbd63 100644
--- a/usr.bin/window/var.c
+++ b/usr.bin/window/var.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: var.c,v 1.3 1997/02/25 00:04:31 downsj Exp $	*/
+/*	$OpenBSD: var.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: var.c,v 1.4 1995/09/28 10:35:01 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)var.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: var.c,v 1.3 1997/02/25 00:04:31 downsj Exp $";
+static char rcsid[] = "$OpenBSD: var.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -56,8 +56,8 @@ struct var **head;
 char *name;
 struct value *v;
 {
-	register struct var **p;
-	register struct var *r;
+	struct var **p;
+	struct var *r;
 	struct value val;
 
 	/* do this first, easier to recover */
@@ -116,8 +116,8 @@ var_unset1(head, name)
 struct var **head;
 char *name;
 {
-	register struct var **p;
-	register struct var *r;
+	struct var **p;
+	struct var *r;
 
 	if (*(p = var_lookup1(head, name)) == 0)
 		return -1;
@@ -134,10 +134,10 @@ char *name;
 
 struct var **
 var_lookup1(p, name)
-register struct var **p;
-register char *name;
+struct var **p;
+char *name;
 {
-	register cmp;
+	int cmp;
 
 	while (*p != 0) {
 		if ((cmp = strcmp(name, (*p)->r_name)) < 0)
@@ -151,7 +151,7 @@ register char *name;
 }
 
 var_walk1(r, func, a)
-register struct var *r;
+struct var *r;
 int (*func)();
 long a;
 {
diff --git a/usr.bin/window/win.c b/usr.bin/window/win.c
index d3054490fc3..ab494ccc425 100644
--- a/usr.bin/window/win.c
+++ b/usr.bin/window/win.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: win.c,v 1.5 1997/02/25 00:04:32 downsj Exp $	*/
+/*	$OpenBSD: win.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: win.c,v 1.8 1996/02/08 21:07:57 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)win.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: win.c,v 1.5 1997/02/25 00:04:32 downsj Exp $";
+static char rcsid[] = "$OpenBSD: win.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -73,7 +73,7 @@ openwin(id, row, col, nrow, ncol, nline, label, type, uflags, shf, sh)
 char *label;
 char *shf, **sh;
 {
-	register struct ww *w;
+	struct ww *w;
 
 	if (id < 0 && (id = findid()) < 0)
 		return 0;
@@ -113,7 +113,7 @@ char *shf, **sh;
 
 findid()
 {
-	register i;
+	int i;
 
 	for (i = 0; i < NWINDOW && window[i] != 0; i++)
 		;
@@ -127,8 +127,8 @@ findid()
 struct ww *
 findselwin()
 {
-	register struct ww *w, *s = 0;
-	register i;
+	struct ww *w, *s = 0;
+	int i;
 
 	for (i = 0; i < NWINDOW; i++)
 		if ((w = window[i]) != 0 && w != selwin &&
@@ -142,10 +142,10 @@ findselwin()
  * Close a user window.  Close all if w == 0.
  */
 closewin(w)
-register struct ww *w;
+struct ww *w;
 {
 	char didit = 0;
-	register i;
+	int i;
 
 	if (w != 0) {
 		closewin1(w);
@@ -178,7 +178,7 @@ struct ww *
 openiwin(nrow, label)
 char *label;
 {
-	register struct ww *w;
+	struct ww *w;
 
 	if ((w = wwopen(WWT_INTERNAL, 0, nrow, wwncol, 2, 0, 0)) == 0)
 		return 0;
@@ -202,7 +202,7 @@ struct ww *w;
 }
 
 closewin1(w)
-register struct ww *w;
+struct ww *w;
 {
 	if (w == selwin)
 		selwin = 0;
@@ -224,7 +224,7 @@ register struct ww *w;
  * Always reframe() if doreframe is true.
  */
 front(w, doreframe)
-register struct ww *w;
+struct ww *w;
 char doreframe;
 {
 	if (w->ww_back != (isfg(w) ? framewin : fgwin) && !wwvisible(w)) {
@@ -241,7 +241,7 @@ char doreframe;
  * For normal windows, we put it behind the current window.
  */
 addwin(w, fg)
-register struct ww *w;
+struct ww *w;
 char fg;
 {
 	if (fg) {
@@ -257,7 +257,7 @@ char fg;
  * Delete a window.
  */
 deletewin(w)
-register struct ww *w;
+struct ww *w;
 {
 	if (fgwin == w)
 		fgwin = w->ww_back;
@@ -266,7 +266,7 @@ register struct ww *w;
 
 reframe()
 {
-	register struct ww *w;
+	struct ww *w;
 
 	wwunframe(framewin);
 	for (w = wwhead.ww_back; w != &wwhead; w = w->ww_back)
@@ -277,7 +277,7 @@ reframe()
 }
 
 labelwin(w)
-register struct ww *w;
+struct ww *w;
 {
 	int mode = w == selwin ? WWM_REV : 0;
 
@@ -303,7 +303,7 @@ register struct ww *w;
 }
 
 stopwin(w)
-	register struct ww *w;
+	struct ww *w;
 {
 	if (w->ww_pty >= 0 && w->ww_type == WWT_PTY && wwstoptty(w->ww_pty) < 0)
 		error("Can't stop output: %s.", wwerror());
@@ -312,7 +312,7 @@ stopwin(w)
 }
 
 startwin(w)
-	register struct ww *w;
+	struct ww *w;
 {
 	if (w->ww_pty >= 0 && w->ww_type == WWT_PTY && wwstarttty(w->ww_pty) < 0)
 		error("Can't start output: %s.", wwerror());
@@ -321,7 +321,7 @@ startwin(w)
 }
 
 sizewin(w, nrow, ncol)
-register struct ww *w;
+struct ww *w;
 {
 	struct ww *back = w->ww_back;
 
@@ -341,7 +341,7 @@ struct ww *w;
 }
 
 more(w, always)
-register struct ww *w;
+struct ww *w;
 char always;
 {
 	int c;
@@ -357,7 +357,7 @@ char always;
 }
 
 waitnl1(w, prompt)
-register struct ww *w;
+struct ww *w;
 char *prompt;
 {
 	int uc = ISSET(w->ww_wflags, WWW_UNCTRL);
diff --git a/usr.bin/window/wwadd.c b/usr.bin/window/wwadd.c
index 086a982becb..a057e9a8764 100644
--- a/usr.bin/window/wwadd.c
+++ b/usr.bin/window/wwadd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwadd.c,v 1.4 1997/02/25 00:04:37 downsj Exp $	*/
+/*	$OpenBSD: wwadd.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwadd.c,v 1.4 1996/02/08 21:48:56 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwadd.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwadd.c,v 1.4 1997/02/25 00:04:37 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwadd.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -51,11 +51,11 @@ static char rcsid[] = "$OpenBSD: wwadd.c,v 1.4 1997/02/25 00:04:37 downsj Exp $"
  * Stick w1 behind w2.
  */
 wwadd(w1, w2)
-register struct ww *w1;
+struct ww *w1;
 struct ww *w2;
 {
-	register i;
-	register struct ww *w;
+	int i;
+	struct ww *w;
 
 	w1->ww_order = w2->ww_order + 1;
 	w1->ww_back = w2;
@@ -66,9 +66,9 @@ struct ww *w2;
 	for (w = w1->ww_forw; w != &wwhead; w = w->ww_forw)
 		w->ww_order++;
 	for (i = w1->ww_i.t; i < w1->ww_i.b; i++) {
-		register j;
-		register unsigned char *smap = wwsmap[i];
-		register char *win = w1->ww_win[i];
+		int j;
+		unsigned char *smap = wwsmap[i];
+		char *win = w1->ww_win[i];
 		union ww_char *ns = wwns[i];
 		union ww_char *buf = w1->ww_buf[i];
 		int nvis = 0;
diff --git a/usr.bin/window/wwalloc.c b/usr.bin/window/wwalloc.c
index cf921e99ed4..693d8ae3466 100644
--- a/usr.bin/window/wwalloc.c
+++ b/usr.bin/window/wwalloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwalloc.c,v 1.4 1998/04/26 22:49:03 millert Exp $	*/
+/*	$OpenBSD: wwalloc.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwalloc.c,v 1.3 1995/09/28 10:35:10 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwalloc.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwalloc.c,v 1.4 1998/04/26 22:49:03 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwalloc.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,8 +53,8 @@ wwalloc(row, col, nrow, ncol, size)
 	int row, col, nrow, ncol;
 	size_t size;
 {
-	register char *p, **pp;
-	register int i;
+	char *p, **pp;
+	int i;
 
 	/* fast, call malloc only once */
 	pp = (char **)
@@ -75,7 +75,7 @@ wwalloc(row, col, nrow, ncol, size)
 }
 
 wwfree(p, row)
-register char **p;
+char **p;
 {
 	free((char *)(p + row));
 }
diff --git a/usr.bin/window/wwbox.c b/usr.bin/window/wwbox.c
index def654980f8..83c43a9a1e7 100644
--- a/usr.bin/window/wwbox.c
+++ b/usr.bin/window/wwbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwbox.c,v 1.3 1997/02/25 00:04:39 downsj Exp $	*/
+/*	$OpenBSD: wwbox.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwbox.c,v 1.3 1995/09/28 10:35:11 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwbox.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwbox.c,v 1.3 1997/02/25 00:04:39 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwbox.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,12 +49,12 @@ static char rcsid[] = "$OpenBSD: wwbox.c,v 1.3 1997/02/25 00:04:39 downsj Exp $"
 #include "tt.h"
 
 wwbox(w, r, c, nr, nc)
-register struct ww *w;
-register r, c;
+struct ww *w;
+int r, c;
 int nr, nc;
 {
-	register r1, c1;
-	register i;
+	int r1, c1;
+	int i;
 
 	r1 = r + nr - 1;
 	c1 = c + nc - 1;
diff --git a/usr.bin/window/wwchild.c b/usr.bin/window/wwchild.c
index 62b053825bf..551995309ba 100644
--- a/usr.bin/window/wwchild.c
+++ b/usr.bin/window/wwchild.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwchild.c,v 1.4 1998/12/21 05:12:06 deraadt Exp $	*/
+/*	$OpenBSD: wwchild.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwchild.c,v 1.3 1995/09/28 10:35:13 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwchild.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwchild.c,v 1.4 1998/12/21 05:12:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwchild.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -54,7 +54,7 @@ wwchild()
 {
 	extern errno;
 	int olderrno;
-	register struct ww **wp;
+	struct ww **wp;
 	int w;
 	int pid;
 	char collected = 0;
diff --git a/usr.bin/window/wwclose.c b/usr.bin/window/wwclose.c
index 4ca529a3942..9f97a54c485 100644
--- a/usr.bin/window/wwclose.c
+++ b/usr.bin/window/wwclose.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwclose.c,v 1.3 1997/02/25 00:04:42 downsj Exp $	*/
+/*	$OpenBSD: wwclose.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwclose.c,v 1.3 1995/09/28 10:35:14 tls Exp $	*/
 
 /*
@@ -41,14 +41,14 @@
 #if 0
 static char sccsid[] = "@(#)wwclose.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwclose.c,v 1.3 1997/02/25 00:04:42 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwclose.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 
 wwclose(w)
-register struct ww *w;
+struct ww *w;
 {
 	wwindex[w->ww_index] = 0;
 	if (w->ww_pty >= 0)
diff --git a/usr.bin/window/wwclreol.c b/usr.bin/window/wwclreol.c
index ffa3b7e922e..a361a5495ef 100644
--- a/usr.bin/window/wwclreol.c
+++ b/usr.bin/window/wwclreol.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwclreol.c,v 1.4 1997/02/25 00:04:43 downsj Exp $	*/
+/*	$OpenBSD: wwclreol.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwclreol.c,v 1.4 1996/02/08 21:48:58 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwclreol.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwclreol.c,v 1.4 1997/02/25 00:04:43 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwclreol.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,17 +53,17 @@ static char rcsid[] = "$OpenBSD: wwclreol.c,v 1.4 1997/02/25 00:04:43 downsj Exp
  * If cleared is true, then the screen line has already been cleared.
  */
 wwclreol1(w, row, col, cleared)
-register struct ww *w;
+struct ww *w;
 int row, col;
 char cleared;
 {
-	register i;
+	int i;
 
 	/*
 	 * Clear the buffer right off
 	 */
 	{
-		register union ww_char *buf;
+		union ww_char *buf;
 
 		buf = &w->ww_buf[row][col]; 
 		for (i = w->ww_b.r - col; --i >= 0;)
@@ -84,9 +84,9 @@ char cleared;
 	 * Now fix wwns.
 	 */
 	{
-		register union ww_char *s;
-		register unsigned char *smap;
-		register char *win;
+		union ww_char *s;
+		unsigned char *smap;
+		char *win;
 
 		i = col;
 		smap = &wwsmap[row][i];
diff --git a/usr.bin/window/wwclreos.c b/usr.bin/window/wwclreos.c
index 87a8900acf7..5a2007a5005 100644
--- a/usr.bin/window/wwclreos.c
+++ b/usr.bin/window/wwclreos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwclreos.c,v 1.4 1997/02/25 00:04:43 downsj Exp $	*/
+/*	$OpenBSD: wwclreos.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwclreos.c,v 1.4 1996/02/08 20:45:07 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwclreos.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwclreos.c,v 1.4 1997/02/25 00:04:43 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwclreos.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,9 +49,9 @@ static char rcsid[] = "$OpenBSD: wwclreos.c,v 1.4 1997/02/25 00:04:43 downsj Exp
 #include "tt.h"
 
 wwclreos(w, row, col)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
+	int i;
 
 	wwclreol(w, row, col);
 	for (i = row + 1; i < w->ww_b.b; i++)
diff --git a/usr.bin/window/wwcursor.c b/usr.bin/window/wwcursor.c
index af942c8757a..8dfa9b2633c 100644
--- a/usr.bin/window/wwcursor.c
+++ b/usr.bin/window/wwcursor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwcursor.c,v 1.4 1997/02/25 00:04:44 downsj Exp $	*/
+/*	$OpenBSD: wwcursor.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwcursor.c,v 1.4 1996/02/08 20:45:08 mycroft Exp $	*/
 
 /*
@@ -41,16 +41,16 @@
 #if 0
 static char sccsid[] = "@(#)wwcursor.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwcursor.c,v 1.4 1997/02/25 00:04:44 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwcursor.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 
 wwcursor(w, on)
-register struct ww *w;
+struct ww *w;
 {
-	register char *win;
+	char *win;
 
 	if (on) {
 		if (ISSET(w->ww_wflags, WWW_HASCURSOR))
@@ -79,11 +79,11 @@ register struct ww *w;
 }
 
 wwsetcursormodes(new)
-register new;
+int new;
 {
-	register i;
-	register struct ww *w;
-	register old = wwcursormodes;
+	int i;
+	struct ww *w;
+	int old = wwcursormodes;
 
 	new &= wwavailmodes;
 	if (new == wwcursormodes)
diff --git a/usr.bin/window/wwdelchar.c b/usr.bin/window/wwdelchar.c
index 30086c8c310..078c142a152 100644
--- a/usr.bin/window/wwdelchar.c
+++ b/usr.bin/window/wwdelchar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdelchar.c,v 1.4 1997/02/25 00:04:46 downsj Exp $	*/
+/*	$OpenBSD: wwdelchar.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwdelchar.c,v 1.4 1996/02/08 21:49:00 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwdelchar.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwdelchar.c,v 1.4 1997/02/25 00:04:46 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwdelchar.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,16 +49,16 @@ static char rcsid[] = "$OpenBSD: wwdelchar.c,v 1.4 1997/02/25 00:04:46 downsj Ex
 #include "tt.h"
 
 wwdelchar(w, row, col)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
+	int i;
 	int nvis;
 
 	/*
 	 * First, shift the line.
 	 */
 	{
-		register union ww_char *p, *q;
+		union ww_char *p, *q;
 
 		p = &w->ww_buf[row][col];
 		q = p + 1;
@@ -81,10 +81,10 @@ register struct ww *w;
 	 * Now find out how much is actually changed, and fix wwns.
 	 */
 	{
-		register union ww_char *buf;
-		register char *win;
-		register union ww_char *ns;
-		register unsigned char *smap;
+		union ww_char *buf;
+		char *win;
+		union ww_char *ns;
+		unsigned char *smap;
 		char touched;
 
 		nvis = 0;
@@ -118,7 +118,7 @@ register struct ww *w;
 	 * Can/Should we use delete character?
 	 */
 	if (tt.tt_delchar != 0 && nvis > (wwncol - col) / 2) {
-		register union ww_char *p, *q;
+		union ww_char *p, *q;
 
 		xxdelchar(row, col);
 		p = &wwos[row][col];
diff --git a/usr.bin/window/wwdelete.c b/usr.bin/window/wwdelete.c
index f82a2fde592..39b1cc4a708 100644
--- a/usr.bin/window/wwdelete.c
+++ b/usr.bin/window/wwdelete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdelete.c,v 1.4 1997/02/25 00:04:47 downsj Exp $	*/
+/*	$OpenBSD: wwdelete.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwdelete.c,v 1.4 1996/02/08 21:49:01 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwdelete.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwdelete.c,v 1.4 1997/02/25 00:04:47 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwdelete.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -51,15 +51,15 @@ static char rcsid[] = "$OpenBSD: wwdelete.c,v 1.4 1997/02/25 00:04:47 downsj Exp
  * Pull w free from the cover list.
  */
 wwdelete(w)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
+	int i;
 
 	for (i = w->ww_i.t; i < w->ww_i.b; i++) {
-		register j;
-		register unsigned char *smap = wwsmap[i];
-		register union ww_char *ns = wwns[i];
-		register int nchanged = 0;
+		int j;
+		unsigned char *smap = wwsmap[i];
+		union ww_char *ns = wwns[i];
+		int nchanged = 0;
 
 		for (j = w->ww_i.l; j < w->ww_i.r; j++)
 			if (smap[j] == w->ww_index) {
@@ -72,7 +72,7 @@ register struct ww *w;
 	}
 
 	{
-		register struct ww *wp;
+		struct ww *wp;
 
 		for (wp = w->ww_forw; wp != &wwhead; wp = wp->ww_forw)
 			wp->ww_order--;
@@ -88,7 +88,7 @@ register struct ww *w;
 }
 
 wwdelete1(w, t, b, l, r)
-register struct ww *w;
+struct ww *w;
 {
 	int i;
 	int tt, bb, ll, rr;
@@ -106,11 +106,11 @@ again:
 		goto again;
 	}
 	for (i = tt; i < bb; i++) {
-		register j;
-		register unsigned char *smap = wwsmap[i];
-		register union ww_char *ns = wwns[i];
-		register char *win = w->ww_win[i];
-		register union ww_char *buf = w->ww_buf[i];
+		int j;
+		unsigned char *smap = wwsmap[i];
+		union ww_char *ns = wwns[i];
+		char *win = w->ww_win[i];
+		union ww_char *buf = w->ww_buf[i];
 		int nvis = w->ww_nvis[i];
 		int nchanged = 0;
 
diff --git a/usr.bin/window/wwdelline.c b/usr.bin/window/wwdelline.c
index 970f44d6c1a..d4ae9cc0cb4 100644
--- a/usr.bin/window/wwdelline.c
+++ b/usr.bin/window/wwdelline.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdelline.c,v 1.3 1997/02/25 00:04:47 downsj Exp $	*/
+/*	$OpenBSD: wwdelline.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwdelline.c,v 1.3 1995/09/28 10:35:24 tls Exp $	*/
 
 /*
@@ -41,19 +41,19 @@
 #if 0
 static char sccsid[] = "@(#)wwdelline.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwdelline.c,v 1.3 1997/02/25 00:04:47 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwdelline.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 
 wwdelline(w, row)
-register struct ww *w;
+struct ww *w;
 int row;
 {
-	register i;
-	register union ww_char **cpp, **cqq;
-	register union ww_char *cp;
+	int i;
+	union ww_char **cpp, **cqq;
+	union ww_char *cp;
 	int row1, row2;
 	char deleted;
 	int visible;
diff --git a/usr.bin/window/wwdump.c b/usr.bin/window/wwdump.c
index 2e49c24749e..0c9e8d91474 100644
--- a/usr.bin/window/wwdump.c
+++ b/usr.bin/window/wwdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdump.c,v 1.3 1997/02/25 00:04:48 downsj Exp $	*/
+/*	$OpenBSD: wwdump.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwdump.c,v 1.5 1995/09/29 00:44:09 cgd Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwdump.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwdump.c,v 1.3 1997/02/25 00:04:48 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwdump.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -52,9 +52,9 @@ static char rcsid[] = "$OpenBSD: wwdump.c,v 1.3 1997/02/25 00:04:48 downsj Exp $
 static char cmap[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
 wwdumpwin(w)
-register struct ww *w;
+struct ww *w;
 {
-	register i, j;
+	int i, j;
 
 	tt.tt_nmodes = 0;
 	(*tt.tt_clear)();
@@ -66,9 +66,9 @@ register struct ww *w;
 }
 
 wwdumpnvis(w)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
+	int i;
 	char buf[20];
 
 	tt.tt_nmodes = 0;
@@ -82,7 +82,7 @@ register struct ww *w;
 
 wwdumpsmap()
 {
-	register i, j;
+	int i, j;
 
 	tt.tt_nmodes = 0;
 	(*tt.tt_clear)();
@@ -95,7 +95,7 @@ wwdumpsmap()
 
 wwdumpns()
 {
-	register i, j;
+	int i, j;
 
 	(*tt.tt_clear)();
 	for (i = 0; i < wwnrow; i++) {
@@ -109,7 +109,7 @@ wwdumpns()
 
 wwdumpos()
 {
-	register i, j;
+	int i, j;
 
 	(*tt.tt_clear)();
 	for (i = 0; i < wwnrow; i++) {
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c
index 677154d5b70..12acc8563d7 100644
--- a/usr.bin/window/wwenviron.c
+++ b/usr.bin/window/wwenviron.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwenviron.c,v 1.5 1998/03/17 04:11:54 deraadt Exp $	*/
+/*	$OpenBSD: wwenviron.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwenviron.c,v 1.4 1995/12/21 08:39:50 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwenviron.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwenviron.c,v 1.5 1998/03/17 04:11:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwenviron.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -55,9 +55,9 @@ static char rcsid[] = "$OpenBSD: wwenviron.c,v 1.5 1998/03/17 04:11:54 deraadt E
  * Set up the environment of this process to run in window 'wp'.
  */
 wwenviron(wp)
-register struct ww *wp;
+struct ww *wp;
 {
-	register i;
+	int i;
 #ifndef TIOCSCTTY
 	int pgrp = getpid();
 #endif
diff --git a/usr.bin/window/wwflush.c b/usr.bin/window/wwflush.c
index 86cc0aec9dc..0091db8a6eb 100644
--- a/usr.bin/window/wwflush.c
+++ b/usr.bin/window/wwflush.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwflush.c,v 1.4 1997/02/25 00:04:52 downsj Exp $	*/
+/*	$OpenBSD: wwflush.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwflush.c,v 1.5 1995/12/21 10:46:08 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwflush.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwflush.c,v 1.4 1997/02/25 00:04:52 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwflush.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: wwflush.c,v 1.4 1997/02/25 00:04:52 downsj Exp
 
 wwflush()
 {
-	register row, col;
+	int row, col;
 
 	if ((row = wwcursorrow) < 0)
 		row = 0;
@@ -104,10 +104,10 @@ wwcheckpoint()
 }
 
 wwcopyscreen(s1, s2)
-	register union ww_char **s1, **s2;
+	union ww_char **s1, **s2;
 {
-	register i;
-	register s = wwncol * sizeof **s1;
+	int i;
+	int s = wwncol * sizeof **s1;
 
 	for (i = wwnrow; --i >= 0;)
 		bcopy((char *) *s1++, (char *) *s2++, s);
diff --git a/usr.bin/window/wwframe.c b/usr.bin/window/wwframe.c
index c25964a7ab2..f4369e0db29 100644
--- a/usr.bin/window/wwframe.c
+++ b/usr.bin/window/wwframe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwframe.c,v 1.4 1997/02/25 00:04:53 downsj Exp $	*/
+/*	$OpenBSD: wwframe.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwframe.c,v 1.4 1996/02/08 21:49:05 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwframe.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwframe.c,v 1.4 1997/02/25 00:04:53 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwframe.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -52,14 +52,14 @@ static char rcsid[] = "$OpenBSD: wwframe.c,v 1.4 1997/02/25 00:04:53 downsj Exp
 	w1->ww_fmap || w1->ww_order > (w)->ww_order)
 
 wwframe(w, wframe)
-register struct ww *w;
+struct ww *w;
 struct ww *wframe;
 {
-	register r, c;
+	int r, c;
 	char a1, a2, a3;
 	char b1, b2, b3;
-	register code;
-	register struct ww *w1;
+	int code;
+	struct ww *w1;
 
 	if (w->ww_w.t > 0) {
 		r = w->ww_w.t - 1;
@@ -199,12 +199,12 @@ struct ww *wframe;
 }
 
 wwframec(f, r, c, code)
-register struct ww *f;
-register r, c;
+struct ww *f;
+int r, c;
 char code;
 {
 	char oldcode;
-	register unsigned char *smap;
+	unsigned char *smap;
 
 	if (r < f->ww_i.t || r >= f->ww_i.b || c < f->ww_i.l || c >= f->ww_i.r)
 		return;
@@ -212,7 +212,7 @@ char code;
 	smap = &wwsmap[r][c];
 
 	{
-		register struct ww *w;
+		struct ww *w;
 
 		w = wwindex[*smap];
 		if (w->ww_order > f->ww_order) {
@@ -223,7 +223,7 @@ char code;
 	}
 
 	if (f->ww_fmap != 0) {
-		register char *fmap;
+		char *fmap;
 
 		fmap = &f->ww_fmap[r][c];
 		oldcode = *fmap;
@@ -234,14 +234,14 @@ char code;
 	} else
 		oldcode = 0;
 	{
-		register char *win = &f->ww_win[r][c];
+		char *win = &f->ww_win[r][c];
 
 		if (*win == WWM_GLS && *smap == f->ww_index)
 			f->ww_nvis[r]++;
 		*win &= ~WWM_GLS;
 	}
 	if (oldcode != code && (code & WWF_LABEL) == 0) {
-		register short frame;
+		short frame;
 
 		frame = tt.tt_frame[code & WWF_MASK];
 		f->ww_buf[r][c].c_w = frame;
diff --git a/usr.bin/window/wwgets.c b/usr.bin/window/wwgets.c
index 14f94977d02..57aa628cd51 100644
--- a/usr.bin/window/wwgets.c
+++ b/usr.bin/window/wwgets.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwgets.c,v 1.4 1997/02/25 00:04:54 downsj Exp $	*/
+/*	$OpenBSD: wwgets.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwgets.c,v 1.6 1996/02/08 20:45:08 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwgets.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwgets.c,v 1.4 1997/02/25 00:04:54 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwgets.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -52,10 +52,10 @@ static char rcsid[] = "$OpenBSD: wwgets.c,v 1.4 1997/02/25 00:04:54 downsj Exp $
 wwgets(buf, n, w)
 char *buf;
 int n;
-register struct ww *w;
+struct ww *w;
 {
-	register char *p = buf;
-	register int c;
+	char *p = buf;
+	int c;
 	int uc = ISSET(w->ww_wflags, WWW_UNCTRL);
 	static void rub();
 
@@ -110,7 +110,7 @@ static void
 rub(c, w)
 struct ww *w;
 {
-	register i;
+	int i;
 
 	for (i = strlen(unctrl(c)); --i >= 0;)
 		(void) wwwrite(w, "\b \b", 3);
diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index 79e9ac4d56a..66a5545687c 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwinit.c,v 1.10 2000/04/15 05:22:14 millert Exp $	*/
+/*	$OpenBSD: wwinit.c,v 1.11 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwinit.c,v 1.11 1996/02/08 21:49:07 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwinit.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: wwinit.c,v 1.10 2000/04/15 05:22:14 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwinit.c,v 1.11 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: wwinit.c,v 1.10 2000/04/15 05:22:14 millert Exp
 
 wwinit()
 {
-	register i, j;
+	int i, j;
 	char *kp;
 	sigset_t sigset, osigset;
 
@@ -350,12 +350,12 @@ bad:
 }
 
 wwaddcap(cap, kp)
-	register char *cap;
-	register char **kp;
+	char *cap;
+	char **kp;
 {
 	char tbuf[512];
 	char *tp = tbuf;
-	register char *str, *p;
+	char *str, *p;
 
 	if ((str = tgetstr(cap, &tp)) != 0) {
 		while (*(*kp)++ = *cap++)
@@ -372,8 +372,8 @@ wwaddcap(cap, kp)
 }
 
 wwaddcap1(cap, kp)
-	register char *cap;
-	register char **kp;
+	char *cap;
+	char **kp;
 {
 	while (*(*kp)++ = *cap++)
 		;
@@ -382,7 +382,7 @@ wwaddcap1(cap, kp)
 
 wwstart()
 {
-	register i;
+	int i;
 
 	(void) wwsettty(0, &wwnewtty);
 	for (i = 0; i < wwnrow; i++)
@@ -392,7 +392,7 @@ wwstart()
 
 wwstart1()
 {
-	register i, j;
+	int i, j;
 
 	for (i = 0; i < wwnrow; i++)
 		for (j = 0; j < wwncol; j++) {
@@ -411,7 +411,7 @@ wwstart1()
  */
 wwreset()
 {
-	register i;
+	int i;
 
 	xxreset();
 	for (i = 0; i < wwnrow; i++)
diff --git a/usr.bin/window/wwinschar.c b/usr.bin/window/wwinschar.c
index 75b1db691bc..a97a062e81b 100644
--- a/usr.bin/window/wwinschar.c
+++ b/usr.bin/window/wwinschar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwinschar.c,v 1.4 1997/02/25 00:04:55 downsj Exp $	*/
+/*	$OpenBSD: wwinschar.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwinschar.c,v 1.4 1996/02/08 21:49:09 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwinschar.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwinschar.c,v 1.4 1997/02/25 00:04:55 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwinschar.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,10 +49,10 @@ static char rcsid[] = "$OpenBSD: wwinschar.c,v 1.4 1997/02/25 00:04:55 downsj Ex
 #include "tt.h"
 
 wwinschar(w, row, col, c, m)
-register struct ww *w;
+struct ww *w;
 char c, m;
 {
-	register i;
+	int i;
 	int nvis;
 	short x = c | m << WWC_MSHIFT;
 
@@ -60,7 +60,7 @@ char c, m;
 	 * First, shift the line.
 	 */
 	{
-		register union ww_char *p, *q;
+		union ww_char *p, *q;
 
 		p = &w->ww_buf[row][w->ww_b.r];
 		q = p - 1;
@@ -83,10 +83,10 @@ char c, m;
 	 * Now find out how much is actually changed, and fix wwns.
 	 */
 	{
-		register union ww_char *buf;
-		register char *win;
-		register union ww_char *ns;
-		register unsigned char *smap;
+		union ww_char *buf;
+		char *win;
+		union ww_char *ns;
+		unsigned char *smap;
 		char touched;
 
 		nvis = 0;
@@ -120,7 +120,7 @@ char c, m;
 	 * Can/Should we use delete character?
 	 */
 	if ((tt.tt_inschar || tt.tt_insspace) && nvis > (wwncol - col) / 2) {
-		register union ww_char *p, *q;
+		union ww_char *p, *q;
 
 		if (tt.tt_inschar)
 			xxinschar(row, col, c, m);
diff --git a/usr.bin/window/wwinsline.c b/usr.bin/window/wwinsline.c
index 7ecb2ed092d..b3d9d83eef1 100644
--- a/usr.bin/window/wwinsline.c
+++ b/usr.bin/window/wwinsline.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwinsline.c,v 1.3 1997/02/25 00:04:56 downsj Exp $	*/
+/*	$OpenBSD: wwinsline.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwinsline.c,v 1.3 1995/09/28 10:35:36 tls Exp $	*/
 
 /*
@@ -41,19 +41,19 @@
 #if 0
 static char sccsid[] = "@(#)wwinsline.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwinsline.c,v 1.3 1997/02/25 00:04:56 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwinsline.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 
 wwinsline(w, row)
-register struct ww *w;
+struct ww *w;
 int row;
 {
-	register i;
-	register union ww_char **cpp, **cqq;
-	register union ww_char *cp;
+	int i;
+	union ww_char **cpp, **cqq;
+	union ww_char *cp;
 	int row1, row2;
 	char deleted;
 	int visible;
diff --git a/usr.bin/window/wwiomux.c b/usr.bin/window/wwiomux.c
index e48a2a4574d..0c1b465751e 100644
--- a/usr.bin/window/wwiomux.c
+++ b/usr.bin/window/wwiomux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwiomux.c,v 1.6 1998/04/26 22:49:01 millert Exp $	*/
+/*	$OpenBSD: wwiomux.c,v 1.7 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwiomux.c,v 1.5 1996/02/08 20:45:09 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwiomux.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwiomux.c,v 1.6 1998/04/26 22:49:01 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwiomux.c,v 1.7 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -65,10 +65,10 @@ static char rcsid[] = "$OpenBSD: wwiomux.c,v 1.6 1998/04/26 22:49:01 millert Exp
  */
 wwiomux()
 {
-	register struct ww *w;
+	struct ww *w;
 	fd_set imask;
-	register n;
-	register char *p;
+	int n;
+	char *p;
 	char c;
 	struct timeval tv;
 	char noblock = 0;
diff --git a/usr.bin/window/wwlabel.c b/usr.bin/window/wwlabel.c
index 69b745edc87..460faec6a5a 100644
--- a/usr.bin/window/wwlabel.c
+++ b/usr.bin/window/wwlabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwlabel.c,v 1.4 1997/02/25 00:04:58 downsj Exp $	*/
+/*	$OpenBSD: wwlabel.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwlabel.c,v 1.4 1996/02/08 21:49:11 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwlabel.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwlabel.c,v 1.4 1997/02/25 00:04:58 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwlabel.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,13 +59,13 @@ struct ww *f;
 char *l;
 {
 	int row;
-	register j;
+	int j;
 	int jj;
-	register char *win;
-	register union ww_char *buf;
-	register union ww_char *ns;
-	register char *fmap;
-	register unsigned char *smap;
+	char *win;
+	union ww_char *buf;
+	union ww_char *ns;
+	char *fmap;
+	unsigned char *smap;
 	char touched;
 	char *p;
 
diff --git a/usr.bin/window/wwmisc.c b/usr.bin/window/wwmisc.c
index d74d3eae3f5..095fa2f21c6 100644
--- a/usr.bin/window/wwmisc.c
+++ b/usr.bin/window/wwmisc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwmisc.c,v 1.4 1997/02/25 00:04:59 downsj Exp $	*/
+/*	$OpenBSD: wwmisc.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwmisc.c,v 1.4 1996/02/08 20:45:10 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwmisc.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwmisc.c,v 1.4 1997/02/25 00:04:59 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwmisc.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,10 +53,10 @@ static char rcsid[] = "$OpenBSD: wwmisc.c,v 1.4 1997/02/25 00:04:59 downsj Exp $
  * Sufficient but not necessary test for total visibility.
  */
 wwvisible(w)
-register struct ww *w;
+struct ww *w;
 {
-	register i;
-	register nvis = 0;
+	int i;
+	int nvis = 0;
 
 	for (i = w->ww_i.t; i < w->ww_i.b; i++)
 		nvis += w->ww_nvis[i];
diff --git a/usr.bin/window/wwmove.c b/usr.bin/window/wwmove.c
index bcb894366e1..2e410362d36 100644
--- a/usr.bin/window/wwmove.c
+++ b/usr.bin/window/wwmove.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwmove.c,v 1.4 1997/02/25 00:04:59 downsj Exp $	*/
+/*	$OpenBSD: wwmove.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwmove.c,v 1.4 1996/02/08 21:49:14 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwmove.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwmove.c,v 1.4 1997/02/25 00:04:59 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwmove.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -51,10 +51,10 @@ static char rcsid[] = "$OpenBSD: wwmove.c,v 1.4 1997/02/25 00:04:59 downsj Exp $
  * Move a window.  Should be unattached.
  */
 wwmove(w, row, col)
-register struct ww *w;
+struct ww *w;
 {
-	register dr, dc;
-	register i;
+	int dr, dc;
+	int i;
 
 	dr = row - w->ww_w.t;
 	dc = col - w->ww_w.l;
@@ -89,9 +89,9 @@ register struct ww *w;
 	}
 	w->ww_nvis -= dr;
 	for (i = w->ww_i.t; i < w->ww_i.b; i++) {
-		register j = w->ww_i.l;
-		register char *win = &w->ww_win[i][j];
-		register unsigned char *smap = &wwsmap[i][j];
+		int j = w->ww_i.l;
+		char *win = &w->ww_win[i][j];
+		unsigned char *smap = &wwsmap[i][j];
 		int nvis = 0;
 
 		for (; j < w->ww_i.r; j++, win++, smap++)
diff --git a/usr.bin/window/wwopen.c b/usr.bin/window/wwopen.c
index 16f89184076..650274cdaeb 100644
--- a/usr.bin/window/wwopen.c
+++ b/usr.bin/window/wwopen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwopen.c,v 1.6 1998/04/26 22:49:09 millert Exp $	*/
+/*	$OpenBSD: wwopen.c,v 1.7 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwopen.c,v 1.6 1996/02/08 21:08:04 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwopen.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: wwopen.c,v 1.6 1998/04/26 22:49:09 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwopen.c,v 1.7 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -54,8 +54,8 @@ static char rcsid[] = "$OpenBSD: wwopen.c,v 1.6 1998/04/26 22:49:09 millert Exp
 struct ww *
 wwopen(type, oflags, nrow, ncol, row, col, nline)
 {
-	register struct ww *w;
-	register i, j;
+	struct ww *w;
+	int i, j;
 	char m;
 	short nvis;
 
diff --git a/usr.bin/window/wwpty.c b/usr.bin/window/wwpty.c
index bd7f77a18de..500c2b1129b 100644
--- a/usr.bin/window/wwpty.c
+++ b/usr.bin/window/wwpty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwpty.c,v 1.4 1998/04/26 22:49:00 millert Exp $	*/
+/*	$OpenBSD: wwpty.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwpty.c,v 1.3 1995/09/28 10:35:45 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwpty.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwpty.c,v 1.4 1998/04/26 22:49:00 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwpty.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,9 +53,9 @@ static char rcsid[] = "$OpenBSD: wwpty.c,v 1.4 1998/04/26 22:49:00 millert Exp $
 #endif
 
 wwgetpty(w)
-register struct ww *w;
+struct ww *w;
 {
-	register char c, *p;
+	char c, *p;
 	int tty;
 	int on = 1;
 #define PTY "/dev/XtyXX"
diff --git a/usr.bin/window/wwputs.c b/usr.bin/window/wwputs.c
index 53ce75cf1dd..64839f3bd51 100644
--- a/usr.bin/window/wwputs.c
+++ b/usr.bin/window/wwputs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwputs.c,v 1.3 1997/02/25 00:05:04 downsj Exp $	*/
+/*	$OpenBSD: wwputs.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwputs.c,v 1.3 1995/09/28 10:35:48 tls Exp $	*/
 
 /*
@@ -41,17 +41,17 @@
 #if 0
 static char sccsid[] = "@(#)wwputs.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwputs.c,v 1.3 1997/02/25 00:05:04 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwputs.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 
 wwputs(s, w)
-register char *s;
+char *s;
 struct ww *w;
 {
-	register char *p = s;
+	char *p = s;
 
 	while (*p++)
 		;
diff --git a/usr.bin/window/wwredraw.c b/usr.bin/window/wwredraw.c
index befef0b30a6..16c91497293 100644
--- a/usr.bin/window/wwredraw.c
+++ b/usr.bin/window/wwredraw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwredraw.c,v 1.3 1997/02/25 00:05:04 downsj Exp $	*/
+/*	$OpenBSD: wwredraw.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwredraw.c,v 1.3 1995/09/28 10:35:49 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwredraw.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwredraw.c,v 1.3 1997/02/25 00:05:04 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwredraw.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -50,8 +50,8 @@ static char rcsid[] = "$OpenBSD: wwredraw.c,v 1.3 1997/02/25 00:05:04 downsj Exp
 
 wwredraw()
 {
-	register i, j;
-	register union ww_char *os;
+	int i, j;
+	union ww_char *os;
 
 	xxclear();
 	for (i = 0; i < wwnrow; i++) {
diff --git a/usr.bin/window/wwredrawwin.c b/usr.bin/window/wwredrawwin.c
index ca0a210ea8a..8632ec4c67f 100644
--- a/usr.bin/window/wwredrawwin.c
+++ b/usr.bin/window/wwredrawwin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwredrawwin.c,v 1.4 1997/02/25 00:05:05 downsj Exp $	*/
+/*	$OpenBSD: wwredrawwin.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwredrawwin.c,v 1.4 1996/02/08 21:49:15 mycroft Exp $	*/
 
 /*
@@ -41,22 +41,22 @@
 #if 0
 static char sccsid[] = "@(#)wwredrawwin.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwredrawwin.c,v 1.4 1997/02/25 00:05:05 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwredrawwin.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 
 wwredrawwin1(w, row1, row2, offset)
-register struct ww *w;
+struct ww *w;
 int row1, row2, offset;
 {
 	int row;
-	register col;
-	register unsigned char *smap;
-	register union ww_char *buf;
-	register char *win;
-	register union ww_char *ns;
+	int col;
+	unsigned char *smap;
+	union ww_char *buf;
+	char *win;
+	union ww_char *ns;
 	int x;
 	int nchanged;
 
diff --git a/usr.bin/window/wwrint.c b/usr.bin/window/wwrint.c
index fbaa7bdd36b..75018672027 100644
--- a/usr.bin/window/wwrint.c
+++ b/usr.bin/window/wwrint.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwrint.c,v 1.4 1997/02/25 00:05:06 downsj Exp $	*/
+/*	$OpenBSD: wwrint.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwrint.c,v 1.4 1995/12/21 10:46:24 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwrint.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwrint.c,v 1.4 1997/02/25 00:05:06 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwrint.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -61,7 +61,7 @@ static char rcsid[] = "$OpenBSD: wwrint.c,v 1.4 1997/02/25 00:05:06 downsj Exp $
 void
 wwrint()
 {
-	register n;
+	int n;
 
 	wwnread++;
 	n = read(0, wwibq, wwibe - wwibq);
diff --git a/usr.bin/window/wwscroll.c b/usr.bin/window/wwscroll.c
index 1146727bc1a..01715bf72fd 100644
--- a/usr.bin/window/wwscroll.c
+++ b/usr.bin/window/wwscroll.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwscroll.c,v 1.3 1997/02/25 00:05:07 downsj Exp $	*/
+/*	$OpenBSD: wwscroll.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwscroll.c,v 1.3 1995/09/28 10:35:53 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwscroll.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwscroll.c,v 1.3 1997/02/25 00:05:07 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwscroll.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,11 +49,11 @@ static char rcsid[] = "$OpenBSD: wwscroll.c,v 1.3 1997/02/25 00:05:07 downsj Exp
 #include "tt.h"
 
 wwscroll(w, n)
-register struct ww *w;
+struct ww *w;
 int n;
 {
-	register dir;
-	register top;
+	int dir;
+	int top;
 
 	if (n == 0)
 		return;
@@ -85,11 +85,11 @@ int n;
  * And don't redraw 'leaveit' lines.
  */
 wwscroll1(w, row1, row2, dir, leaveit)
-register struct ww *w;
+struct ww *w;
 int row1, row2, dir;
 int leaveit;
 {
-	register i;
+	int i;
 	int row1x, row2x;
 	int nvis;
 	int nvismax;
@@ -134,8 +134,8 @@ int leaveit;
 	 * Fix up the old screen.
 	 */
 	{
-		register union ww_char *tmp;
-		register union ww_char **cpp, **cqq;
+		union ww_char *tmp;
+		union ww_char **cpp, **cqq;
 
 		if (dir > 0) {
 			cpp = &wwos[row1x];
@@ -166,8 +166,8 @@ no_scroll:
 		 */
 		if (dir > 0) {
 			{
-				register union ww_char *tmp;
-				register union ww_char **cpp, **cqq;
+				union ww_char *tmp;
+				union ww_char **cpp, **cqq;
 
 				cpp = &wwns[row1x];
 				cqq = cpp + 1;
@@ -177,7 +177,7 @@ no_scroll:
 				*cpp = tmp;
 			}
 			if (scrolled) {
-				register char *p, *q;
+				char *p, *q;
 
 				p = &wwtouched[row1x];
 				q = p + 1;
@@ -185,7 +185,7 @@ no_scroll:
 					*p++ = *q++;
 				*p |= WWU_TOUCHED;
 			} else {
-				register char *p;
+				char *p;
 
 				p = &wwtouched[row1x];
 				for (i = row2x - row1x; --i >= 0;)
@@ -195,8 +195,8 @@ no_scroll:
 			wwredrawwin1(w, row2x - 1, row2 - leaveit, dir);
 		} else {
 			{
-				register union ww_char *tmp;
-				register union ww_char **cpp, **cqq;
+				union ww_char *tmp;
+				union ww_char **cpp, **cqq;
 
 				cpp = &wwns[row2x];
 				cqq = cpp - 1;
@@ -206,7 +206,7 @@ no_scroll:
 				*cqq = tmp;
 			}
 			if (scrolled) {
-				register char *p, *q;
+				char *p, *q;
 
 				p = &wwtouched[row2x];
 				q = p - 1;
@@ -214,7 +214,7 @@ no_scroll:
 					*--p = *--q;
 				*q |= WWU_TOUCHED;
 			} else {
-				register char *p;
+				char *p;
 
 				p = &wwtouched[row1x];
 				for (i = row2x - row1x; --i >= 0;)
@@ -225,7 +225,7 @@ no_scroll:
 		}
 	} else {
 		if (scrolled) {
-			register char *p;
+			char *p;
 
 			p = &wwtouched[row1x];
 			for (i = row2x - row1x; --i >= 0;)
diff --git a/usr.bin/window/wwsize.c b/usr.bin/window/wwsize.c
index 6c25cb78093..e594b439a8b 100644
--- a/usr.bin/window/wwsize.c
+++ b/usr.bin/window/wwsize.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwsize.c,v 1.6 1998/04/26 22:49:02 millert Exp $	*/
+/*	$OpenBSD: wwsize.c,v 1.7 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwsize.c,v 1.5 1996/02/08 20:45:11 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwsize.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwsize.c,v 1.6 1998/04/26 22:49:02 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwsize.c,v 1.7 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -52,9 +52,9 @@ static char rcsid[] = "$OpenBSD: wwsize.c,v 1.6 1998/04/26 22:49:02 millert Exp
  * Resize a window.  Should be unattached.
  */
 wwsize(w, nrow, ncol)
-register struct ww *w;
+struct ww *w;
 {
-	register i, j;
+	int i, j;
 	int nline;
 	union ww_char **buf = 0;
 	char **win = 0;
diff --git a/usr.bin/window/wwspawn.c b/usr.bin/window/wwspawn.c
index 6d358a0a168..e1b99492c4d 100644
--- a/usr.bin/window/wwspawn.c
+++ b/usr.bin/window/wwspawn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwspawn.c,v 1.5 1997/02/25 00:05:09 downsj Exp $	*/
+/*	$OpenBSD: wwspawn.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwspawn.c,v 1.4 1995/12/21 08:39:57 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwspawn.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.5 1997/02/25 00:05:09 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.5 1997/02/25 00:05:09 downsj Exp
  * So we have to be sneaky about error reporting.
  */
 wwspawn(wp, file, argv)
-register struct ww *wp;
+struct ww *wp;
 char *file;
 char **argv;
 {
diff --git a/usr.bin/window/wwtty.c b/usr.bin/window/wwtty.c
index a84548dc1ef..a04f7d74f5d 100644
--- a/usr.bin/window/wwtty.c
+++ b/usr.bin/window/wwtty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwtty.c,v 1.4 1997/02/25 00:05:11 downsj Exp $	*/
+/*	$OpenBSD: wwtty.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwtty.c,v 1.4 1995/12/21 11:06:50 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwtty.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwtty.c,v 1.4 1997/02/25 00:05:11 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwtty.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: wwtty.c,v 1.4 1997/02/25 00:05:11 downsj Exp $"
 #endif
 
 wwgettty(d, t)
-register struct ww_tty *t;
+struct ww_tty *t;
 {
 #ifdef OLD_TTY
 	if (ioctl(d, TIOCGETP, (char *)&t->ww_sgttyb) < 0)
@@ -82,7 +82,7 @@ bad:
  * it changes, to avoid unnecessary flushing of typeahead.
  */
 wwsettty(d, t)
-register struct ww_tty *t;
+struct ww_tty *t;
 {
 #ifdef OLD_TTY
 	int i;
diff --git a/usr.bin/window/wwunframe.c b/usr.bin/window/wwunframe.c
index 3c565430504..e480d7ca3da 100644
--- a/usr.bin/window/wwunframe.c
+++ b/usr.bin/window/wwunframe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwunframe.c,v 1.4 1997/02/25 00:05:12 downsj Exp $	*/
+/*	$OpenBSD: wwunframe.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwunframe.c,v 1.4 1996/02/08 21:49:17 mycroft Exp $	*/
 
 /*
@@ -41,23 +41,23 @@
 #if 0
 static char sccsid[] = "@(#)wwunframe.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwunframe.c,v 1.4 1997/02/25 00:05:12 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwunframe.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 
 wwunframe(w)
-register struct ww *w;
+struct ww *w;
 {
 	int i;
 
 	for (i = w->ww_i.t; i < w->ww_i.b; i++) {
-		register j;
-		register char *win = w->ww_win[i];
-		register char *fmap = w->ww_fmap ? w->ww_fmap[i] : 0;
-		register unsigned char *smap = wwsmap[i];
-		register union ww_char *ns = wwns[i];
+		int j;
+		char *win = w->ww_win[i];
+		char *fmap = w->ww_fmap ? w->ww_fmap[i] : 0;
+		unsigned char *smap = wwsmap[i];
+		union ww_char *ns = wwns[i];
 		int nchanged = 0;
 
 		for (j = w->ww_i.l; j < w->ww_i.r; j++) {
diff --git a/usr.bin/window/wwupdate.c b/usr.bin/window/wwupdate.c
index bd8f6438597..90f3412a153 100644
--- a/usr.bin/window/wwupdate.c
+++ b/usr.bin/window/wwupdate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwupdate.c,v 1.3 1997/02/25 00:05:13 downsj Exp $	*/
+/*	$OpenBSD: wwupdate.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwupdate.c,v 1.3 1995/09/28 10:36:00 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwupdate.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwupdate.c,v 1.3 1997/02/25 00:05:13 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwupdate.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: wwupdate.c,v 1.3 1997/02/25 00:05:13 downsj Exp
 wwupdate1(top, bot)
 {
 	int i;
-	register j;
+	int j;
 	char *touched;
 	struct ww_update *upd;
 	char check_clreos = 0;
@@ -59,8 +59,8 @@ wwupdate1(top, bot)
 
 	wwnupdate++;
 	{
-		register char *t1 = wwtouched + top, *t2 = wwtouched + bot;
-		register n;
+		char *t1 = wwtouched + top, *t2 = wwtouched + bot;
+		int n;
 
 		while (!*t1++)
 			if (t1 == t2)
@@ -95,10 +95,10 @@ wwupdate1(top, bot)
 	for (i = scan_top, touched = &wwtouched[i], upd = &wwupd[i];
 	     i < scan_bot;
 	     i++, touched++, upd++) {
-		register gain = 0;
-		register best_gain = 0;
-		register best_col;
-		register union ww_char *ns, *os;
+		int gain = 0;
+		int best_gain = 0;
+		int best_col;
+		union ww_char *ns, *os;
 
 		if (wwinterrupt())
 			return;
@@ -134,11 +134,11 @@ wwupdate1(top, bot)
 		upd->gain = gain;
 	}
 	if (check_clreos) {
-		register struct ww_update *u;
-		register gain = 0;
-		register best_gain = 0;
+		struct ww_update *u;
+		int gain = 0;
+		int best_gain = 0;
 		int best_row;
-		register simple_gain = 0;
+		int simple_gain = 0;
 		char didit = 0;
 
 		/*
@@ -150,7 +150,7 @@ wwupdate1(top, bot)
 		 * undefined when u->best_gain is 0 so we can't use it.
 		 */
 		for (j = scan_bot - 1, u = wwupd + j; j >= top; j--, u--) {
-			register g = gain + u->best_gain;
+			int g = gain + u->best_gain;
 
 			if (g > best_gain) {
 				best_gain = g;
@@ -180,7 +180,7 @@ wwupdate1(top, bot)
 			wwnupdclreosline += wwnrow - i;
 			u = wwupd + i;
 			while (i < scan_bot) {
-				register union ww_char *os = &wwos[i][j];
+				union ww_char *os = &wwos[i][j];
 
 				for (j = wwncol - j; --j >= 0;)
 					os++->c_w = ' ';
@@ -194,7 +194,7 @@ wwupdate1(top, bot)
 simple:
 	for (i = top, touched = &wwtouched[i], upd = &wwupd[i]; i < bot;
 	     i++, touched++, upd++) {
-		register union ww_char *os, *ns;
+		union ww_char *os, *ns;
 		char didit;
 
 		if (!*touched)
@@ -212,10 +212,10 @@ simple:
 		ns = wwns[i];
 		os = wwos[i];
 		for (j = 0; j < wwncol;) {
-			register char *p, *q;
+			char *p, *q;
 			char m;
 			int c;
-			register n;
+			int n;
 			char buf[512];			/* > wwncol */
 			union ww_char lastc;
 
diff --git a/usr.bin/window/wwwrite.c b/usr.bin/window/wwwrite.c
index 7d05ea229b7..f86c629a45b 100644
--- a/usr.bin/window/wwwrite.c
+++ b/usr.bin/window/wwwrite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwwrite.c,v 1.4 1997/02/25 00:05:14 downsj Exp $	*/
+/*	$OpenBSD: wwwrite.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: wwwrite.c,v 1.5 1996/02/08 21:49:19 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwwrite.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwwrite.c,v 1.4 1997/02/25 00:05:14 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwwrite.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,8 +64,8 @@ static char rcsid[] = "$OpenBSD: wwwrite.c,v 1.4 1997/02/25 00:05:14 downsj Exp
  * to avoid recursion, which might be a better idea.
  */
 wwwrite(w, p, n)
-register struct ww *w;
-register char *p;
+struct ww *w;
+char *p;
 int n;
 {
 	int hascursor;
@@ -91,8 +91,8 @@ int n;
 		if (w->ww_wstate == 0 &&
 		    (isprt(*p) || ISSET(w->ww_wflags, WWW_UNCTRL) &&
 		     isunctrl(*p))) {
-			register i;
-			register union ww_char *bp;
+			int i;
+			union ww_char *bp;
 			int col, col1;
 
 			if (ISSET(w->ww_wflags, WWW_INSERT)) {
@@ -122,7 +122,7 @@ int n;
 					q = s;
 					r = 0;
 				} else if (*p == '\t') {
-					register tmp = 8 - (i - w->ww_w.l & 7);
+					int tmp = 8 - (i - w->ww_w.l & 7);
 					p++;
 					i += tmp;
 					bp += tmp;
@@ -143,10 +143,10 @@ int n;
 			w->ww_cur.c = i;
 			if (w->ww_cur.r >= w->ww_i.t
 			    && w->ww_cur.r < w->ww_i.b) {
-				register union ww_char *ns = wwns[w->ww_cur.r];
-				register unsigned char *smap =
+				union ww_char *ns = wwns[w->ww_cur.r];
+				unsigned char *smap =
 				    &wwsmap[w->ww_cur.r][col];
-				register char *win = w->ww_win[w->ww_cur.r];
+				char *win = w->ww_win[w->ww_cur.r];
 				int nchanged = 0;
 
 				bp = w->ww_buf[w->ww_cur.r];
diff --git a/usr.bin/window/xx.c b/usr.bin/window/xx.c
index 97f6653e795..e3feb8c9289 100644
--- a/usr.bin/window/xx.c
+++ b/usr.bin/window/xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xx.c,v 1.4 1998/04/26 22:49:10 millert Exp $	*/
+/*	$OpenBSD: xx.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: xx.c,v 1.3 1995/09/28 10:36:03 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)xx.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: xx.c,v 1.4 1998/04/26 22:49:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: xx.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -86,7 +86,7 @@ xxreset()
 
 xxreset1()
 {
-	register struct xx *xp, *xq;
+	struct xx *xp, *xq;
 
 	for (xp = xx_head; xp != 0; xp = xq) {
 		xq = xp->link;
@@ -115,7 +115,7 @@ xxend()
 struct xx *
 xxalloc()
 {
-	register struct xx *xp;
+	struct xx *xp;
 
 	if (xxbufp > xxbufe)
 		abort();
@@ -134,7 +134,7 @@ xxalloc()
 }
 
 xxfree(xp)
-	register struct xx *xp;
+	struct xx *xp;
 {
 	xp->link = xx_freelist;
 	xx_freelist = xp;
@@ -142,7 +142,7 @@ xxfree(xp)
 
 xxmove(row, col)
 {
-	register struct xx *xp = xx_tail;
+	struct xx *xp = xx_tail;
 
 	if (xp == 0 || xp->cmd != xc_move) {
 		xp = xxalloc();
@@ -154,7 +154,7 @@ xxmove(row, col)
 
 xxscroll(dir, top, bot)
 {
-	register struct xx *xp = xx_tail;
+	struct xx *xp = xx_tail;
 
 	if (xp != 0 && xp->cmd == xc_scroll &&
 	    xp->arg1 == top && xp->arg2 == bot &&
@@ -171,7 +171,7 @@ xxscroll(dir, top, bot)
 
 xxinschar(row, col, c, m)
 {
-	register struct xx *xp;
+	struct xx *xp;
 
 	xp = xxalloc();
 	xp->cmd = xc_inschar;
@@ -183,7 +183,7 @@ xxinschar(row, col, c, m)
 
 xxinsspace(row, col)
 {
-	register struct xx *xp = xx_tail;
+	struct xx *xp = xx_tail;
 
 	if (xp != 0 && xp->cmd == xc_insspace && xp->arg0 == row &&
 	    col >= xp->arg1 && col <= xp->arg1 + xp->arg2) {
@@ -199,7 +199,7 @@ xxinsspace(row, col)
 
 xxdelchar(row, col)
 {
-	register struct xx *xp = xx_tail;
+	struct xx *xp = xx_tail;
 
 	if (xp != 0 && xp->cmd == xc_delchar &&
 	    xp->arg0 == row && xp->arg1 == col) {
@@ -215,7 +215,7 @@ xxdelchar(row, col)
 
 xxclear()
 {
-	register struct xx *xp;
+	struct xx *xp;
 
 	xxreset1();
 	xp = xxalloc();
@@ -224,7 +224,7 @@ xxclear()
 
 xxclreos(row, col)
 {
-	register struct xx *xp = xxalloc();
+	struct xx *xp = xxalloc();
 
 	xp->cmd = xc_clreos;
 	xp->arg0 = row;
@@ -233,7 +233,7 @@ xxclreos(row, col)
 
 xxclreol(row, col)
 {
-	register struct xx *xp = xxalloc();
+	struct xx *xp = xxalloc();
 
 	xp->cmd = xc_clreol;
 	xp->arg0 = row;
@@ -243,7 +243,7 @@ xxclreol(row, col)
 xxwrite(row, col, p, n, m)
 	char *p;
 {
-	register struct xx *xp;
+	struct xx *xp;
 
 	if (xxbufp + n + 1 > xxbufe)
 		xxflush(0);
diff --git a/usr.bin/window/xxflush.c b/usr.bin/window/xxflush.c
index d73123d33a3..9ec199011b7 100644
--- a/usr.bin/window/xxflush.c
+++ b/usr.bin/window/xxflush.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xxflush.c,v 1.3 1997/02/25 00:05:17 downsj Exp $	*/
+/*	$OpenBSD: xxflush.c,v 1.4 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: xxflush.c,v 1.3 1995/09/28 10:36:05 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)xxflush.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: xxflush.c,v 1.3 1997/02/25 00:05:17 downsj Exp $";
+static char rcsid[] = "$OpenBSD: xxflush.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -50,9 +50,9 @@ static char rcsid[] = "$OpenBSD: xxflush.c,v 1.3 1997/02/25 00:05:17 downsj Exp
 #include "tt.h"
 
 xxflush(intr)
-	register intr;
+	int intr;
 {
-	register struct xx *xp, *xq;
+	struct xx *xp, *xq;
 
 	for (xp = xx_head; xp != 0 && !(intr && wwinterrupt()); xp = xq) {
 		switch (xp->cmd) {
@@ -104,9 +104,9 @@ xxflush(intr)
 }
 
 xxflush_scroll(xp)
-	register struct xx *xp;
+	struct xx *xp;
 {
-	register struct xx *xq;
+	struct xx *xq;
 
  top:
 	if (xp->arg0 == 0)
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 46f83c37ae1..355c05b9095 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: write.c,v 1.13 2001/11/02 16:25:30 deraadt Exp $	*/
+/*	$OpenBSD: write.c,v 1.14 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)write.c	8.2 (Berkeley) 4/27/95";
 #endif
-static char *rcsid = "$OpenBSD: write.c,v 1.13 2001/11/02 16:25:30 deraadt Exp $";
+static char *rcsid = "$OpenBSD: write.c,v 1.14 2001/11/19 19:02:18 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -78,7 +78,7 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register char *cp;
+	char *cp;
 	time_t atime;
 	uid_t myuid;
 	int msgsok, myttyfd;
@@ -251,8 +251,8 @@ do_write(tty, mytty, myuid)
 	char *tty, *mytty;
 	uid_t myuid;
 {
-	register char *login, *nows;
-	register struct passwd *pwd;
+	char *login, *nows;
+	struct passwd *pwd;
 	time_t now;
 	char path[MAXPATHLEN], host[MAXHOSTNAMELEN], line[512];
 
@@ -303,9 +303,9 @@ done(int sig)
  */
 void
 wr_fputs(s)
-	register char *s;
+	char *s;
 {
-	register u_char c;
+	u_char c;
 	char visout[5], *s2;
 
 #define	PUTC(c)	if (putchar(c) == EOF) goto err;
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index e56bb92320d..63d8ca80951 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xargs.c,v 1.8 1998/06/23 00:22:58 deraadt Exp $	*/
+/*	$OpenBSD: xargs.c,v 1.9 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: xargs.c,v 1.7 1994/11/14 06:51:41 jtc Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)xargs.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: xargs.c,v 1.8 1998/06/23 00:22:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: xargs.c,v 1.9 2001/11/19 19:02:18 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -74,8 +74,8 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register int ch;
-	register char *p, *bbp, *ebp, **bxp, **exp, **xp;
+	int ch;
+	char *p, *bbp, *ebp, **bxp, **exp, **xp;
 	int cnt, indouble, insingle, nargs, nflag, nline, xflag;
 	char **av, *argp;
 	int arg_max;
@@ -279,7 +279,7 @@ run(argv)
 	char **argv;
 {
 	volatile int noinvoke;
-	register char **p;
+	char **p;
 	pid_t pid;
 	int status;
 
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 0ad53a0d0cb..df9fb81f6d2 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xinstall.c,v 1.28 2001/08/25 19:52:05 heko Exp $	*/
+/*	$OpenBSD: xinstall.c,v 1.29 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #endif
-static char rcsid[] = "$OpenBSD: xinstall.c,v 1.28 2001/08/25 19:52:05 heko Exp $";
+static char rcsid[] = "$OpenBSD: xinstall.c,v 1.29 2001/11/19 19:02:18 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -90,7 +90,7 @@ void	strip __P((char *));
 void	usage __P((void));
 int	create_newfile __P((char *, struct stat *));
 int	create_tempfile __P((char *, char *, size_t));
-int	file_write __P((int, char *, register size_t, int *, int *, int));
+int	file_write __P((int, char *, size_t, int *, int *, int));
 
 int
 main(argc, argv)
@@ -420,12 +420,12 @@ install(from_name, to_name, fset, flags)
  */
 void
 copy(from_fd, from_name, to_fd, to_name, size, sparse)
-	register int from_fd, to_fd;
+	int from_fd, to_fd;
 	char *from_name, *to_name;
 	off_t size;
 	int sparse;
 {
-	register ssize_t nr, nw;
+	ssize_t nr, nw;
 	int serrno;
 	char *p, buf[MAXBSIZE];
 
@@ -579,7 +579,7 @@ void
 install_dir(path)
         char *path;
 {
-	register char *p;
+	char *p;
 	struct stat sb;
 	int ch;
 
@@ -724,15 +724,15 @@ int
 file_write(fd, str, cnt, rem, isempt, sz)
 	int fd;
 	char *str;
-	register size_t cnt;
+	size_t cnt;
 	int *rem;
 	int *isempt;
 	int sz;
 {
-	register char *pt;
-	register char *end;
-	register size_t wcnt;
-	register char *st = str;
+	char *pt;
+	char *end;
+	size_t wcnt;
+	char *st = str;
 
 	/*
 	 * while we have data to process
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 5ee3c863b70..0ab960b03d3 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xstr.c,v 1.5 2001/07/20 14:20:29 deraadt Exp $	*/
+/*	$OpenBSD: xstr.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: xstr.c,v 1.5 1994/12/24 16:57:59 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)xstr.c	8.1 (Berkeley) 6/9/93";
 #endif
-static char rcsid[] = "$OpenBSD: xstr.c,v 1.5 2001/07/20 14:20:29 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: xstr.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -156,8 +156,8 @@ process(name)
 	char *name;
 {
 	char *cp;
-	register int c;
-	register int incomm = 0;
+	int c;
+	int incomm = 0;
 	int ret;
 
 	printf("extern char\t%s[];\n", array);
@@ -224,13 +224,13 @@ out:
 
 off_t
 yankstr(cpp)
-	register char **cpp;
+	char **cpp;
 {
-	register char *cp = *cpp;
-	register int c, ch;
+	char *cp = *cpp;
+	int c, ch;
 	char dbuf[BUFSIZ];
-	register char *dp = dbuf;
-	register char *tp;
+	char *dp = dbuf;
+	char *tp;
 
 	while (c = *cp++) {
 		switch (c) {
@@ -292,7 +292,7 @@ octdigit(c)
 inithash()
 {
 	char buf[BUFSIZ];
-	register FILE *mesgread = fopen(strings, "r");
+	FILE *mesgread = fopen(strings, "r");
 
 	if (mesgread == NULL)
 		return;
@@ -307,11 +307,11 @@ inithash()
 
 fgetNUL(obuf, rmdr, file)
 	char *obuf;
-	register int rmdr;
+	int rmdr;
 	FILE *file;
 {
-	register c;
-	register char *buf = obuf;
+	int c;
+	char *buf = obuf;
 
 	while (--rmdr > 0 && (c = xgetc(file)) != 0 && c != EOF)
 		*buf++ = c;
@@ -342,7 +342,7 @@ hashit(str, new)
 	int new;
 {
 	int i;
-	register struct hash *hp, *hp0;
+	struct hash *hp, *hp0;
 
 	hp = hp0 = &bucket[lastchr(str) & 0177];
 	while (hp->hnext) {
@@ -369,10 +369,10 @@ hashit(str, new)
 
 flushsh()
 {
-	register int i;
-	register struct hash *hp;
-	register FILE *mesgwrit;
-	register int old = 0, new = 0;
+	int i;
+	struct hash *hp;
+	FILE *mesgwrit;
+	int old = 0, new = 0;
 
 	for (i = 0; i < BUCKETS; i++)
 		for (hp = bucket[i].hnext; hp != NULL; hp = hp->hnext)
@@ -415,9 +415,9 @@ found(new, off, str)
 }
 
 prstr(cp)
-	register char *cp;
+	char *cp;
 {
-	register int c;
+	int c;
 
 	while (c = (*cp++ & 0377))
 		if (c < ' ')
@@ -432,8 +432,8 @@ prstr(cp)
 
 xsdotc()
 {
-	register FILE *strf = fopen(strings, "r");
-	register FILE *xdotcf;
+	FILE *strf = fopen(strings, "r");
+	FILE *xdotcf;
 
 	if (strf == NULL)
 		perror(strings), exit(5);
@@ -442,7 +442,7 @@ xsdotc()
 		perror("xs.c"), exit(6);
 	fprintf(xdotcf, "char\t%s[] = {\n", array);
 	for (;;) {
-		register int i, c;
+		int i, c;
 
 		for (i = 0; i < 8; i++) {
 			c = getc(strf);
@@ -465,7 +465,7 @@ out:
 }
 
 lastchr(cp)
-	register char *cp;
+	char *cp;
 {
 
 	while (cp[0] && cp[1])
@@ -474,9 +474,9 @@ lastchr(cp)
 }
 
 istail(str, of)
-	register char *str, *of;
+	char *str, *of;
 {
-	register int d = strlen(of) - strlen(str);
+	int d = strlen(of) - strlen(str);
 
 	if (d < 0 || strcmp(&of[d], str) != 0)
 		return (-1);
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 2437c1da994..8e9cdac645d 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: closure.c,v 1.4 2001/07/16 06:29:43 pvalchev Exp $	*/
+/*	$OpenBSD: closure.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: closure.c,v 1.4 1996/03/19 03:21:29 jtc Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
 #else
-static char rcsid[] = "$OpenBSD: closure.c,v 1.4 2001/07/16 06:29:43 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: closure.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -58,12 +58,12 @@ static unsigned *EFF;
 void
 set_EFF()
 {
-    register unsigned *row;
-    register int symbol;
-    register short *sp;
-    register int rowsize;
-    register int i;
-    register int rule;
+    unsigned *row;
+    int symbol;
+    short *sp;
+    int rowsize;
+    int i;
+    int rule;
 
     rowsize = WORDSIZE(nvars);
     EFF = NEW2(nvars * rowsize, unsigned);
@@ -95,12 +95,12 @@ set_EFF()
 void
 set_first_derives()
 {
-    register unsigned *rrow;
-    register unsigned *vrow;
-    register int j;
-    register unsigned k;
-    register unsigned cword;
-    register short *rp;
+    unsigned *rrow;
+    unsigned *vrow;
+    int j;
+    unsigned k;
+    unsigned cword;
+    short *rp;
 
     int rule;
     int i;
@@ -153,13 +153,13 @@ closure(nucleus, n)
 short *nucleus;
 int n;
 {
-    register int ruleno;
-    register unsigned word;
-    register unsigned i;
-    register short *csp;
-    register unsigned *dsp;
-    register unsigned *rsp;
-    register int rulesetsize;
+    int ruleno;
+    unsigned word;
+    unsigned i;
+    short *csp;
+    unsigned *dsp;
+    unsigned *rsp;
+    int rulesetsize;
 
     short *csend;
     unsigned *rsend;
@@ -233,7 +233,7 @@ finalize_closure()
 print_closure(n)
 int n;
 {
-  register short *isp;
+  short *isp;
 
   printf("\n\nn = %d\n\n", n);
   for (isp = itemset; isp < itemsetend; isp++)
@@ -243,10 +243,10 @@ int n;
 
 print_EFF()
 {
-    register int i, j;
-    register unsigned *rowp;
-    register unsigned word;
-    register unsigned k;
+    int i, j;
+    unsigned *rowp;
+    unsigned word;
+    unsigned k;
 
     printf("\n\nEpsilon Free Firsts\n");
 
@@ -274,11 +274,11 @@ print_EFF()
 
 print_first_derives()
 {
-    register int i;
-    register int j;
-    register unsigned *rp;
-    register unsigned cword;
-    register unsigned k;
+    int i;
+    int j;
+    unsigned *rp;
+    unsigned cword;
+    unsigned k;
 
     printf("\n\n\nFirst Derives\n");
 
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 9758d6bb6dd..3a6a967f491 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: error.c,v 1.5 2001/07/16 06:29:44 pvalchev Exp $	*/
+/*	$OpenBSD: error.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: error.c,v 1.4 1996/03/19 03:21:32 jtc Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
 #else
-static char rcsid[] = "$OpenBSD: error.c,v 1.5 2001/07/16 06:29:44 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -90,7 +90,7 @@ print_pos(st_line, st_cptr)
 char *st_line;
 char *st_cptr;
 {
-    register char *s;
+    char *s;
 
     if (st_line == 0) return;
     for (s = st_line; *s != '\n'; ++s)
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 280e177e4d1..20a9e4071cd 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lalr.c,v 1.4 2001/07/16 06:29:44 pvalchev Exp $	*/
+/*	$OpenBSD: lalr.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: lalr.c,v 1.4 1996/03/19 03:21:33 jtc Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
 #else
-static char rcsid[] = "$OpenBSD: lalr.c,v 1.4 2001/07/16 06:29:44 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: lalr.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -117,7 +117,7 @@ lalr()
 void
 set_state_table()
 {
-    register core *sp;
+    core *sp;
 
     state_table = NEW2(nstates, core *);
     for (sp = first_state; sp; sp = sp->next)
@@ -128,7 +128,7 @@ set_state_table()
 void
 set_accessing_symbol()
 {
-    register core *sp;
+    core *sp;
 
     accessing_symbol = NEW2(nstates, short);
     for (sp = first_state; sp; sp = sp->next)
@@ -139,7 +139,7 @@ set_accessing_symbol()
 void
 set_shift_table()
 {
-    register shifts *sp;
+    shifts *sp;
 
     shift_table = NEW2(nstates, shifts *);
     for (sp = first_shift; sp; sp = sp->next)
@@ -150,7 +150,7 @@ set_shift_table()
 void
 set_reduction_table()
 {
-    register reductions *rp;
+    reductions *rp;
 
     reduction_table = NEW2(nstates, reductions *);
     for (rp = first_reduction; rp; rp = rp->next)
@@ -161,10 +161,10 @@ set_reduction_table()
 void
 set_maxrhs()
 {
-  register short *itemp;
-  register short *item_end;
-  register int length;
-  register int max;
+  short *itemp;
+  short *item_end;
+  int length;
+  int max;
 
   length = 0;
   max = 0;
@@ -189,8 +189,8 @@ set_maxrhs()
 void
 initialize_LA()
 {
-  register int i, j, k;
-  register reductions *rp;
+  int i, j, k;
+  reductions *rp;
 
   lookaheads = NEW2(nstates + 1, short);
 
@@ -226,13 +226,13 @@ initialize_LA()
 void
 set_goto_map()
 {
-  register shifts *sp;
-  register int i;
-  register int symbol;
-  register int k;
-  register short *temp_map;
-  register int state2;
-  register int state1;
+  shifts *sp;
+  int i;
+  int symbol;
+  int k;
+  short *temp_map;
+  int state2;
+  int state1;
 
   goto_map = NEW2(nvars + 1, short) - ntokens;
   temp_map = NEW2(nvars + 1, short) - ntokens;
@@ -298,10 +298,10 @@ map_goto(state, symbol)
 int state;
 int symbol;
 {
-    register int high;
-    register int low;
-    register int middle;
-    register int s;
+    int high;
+    int low;
+    int middle;
+    int s;
 
     low = goto_map[symbol];
     high = goto_map[symbol + 1];
@@ -324,18 +324,18 @@ int symbol;
 void
 initialize_F()
 {
-  register int i;
-  register int j;
-  register int k;
-  register shifts *sp;
-  register short *edge;
-  register unsigned *rowp;
-  register short *rp;
-  register short **reads;
-  register int nedges;
-  register int stateno;
-  register int symbol;
-  register int nwords;
+  int i;
+  int j;
+  int k;
+  shifts *sp;
+  short *edge;
+  unsigned *rowp;
+  short *rp;
+  short **reads;
+  int nedges;
+  int stateno;
+  int symbol;
+  int nwords;
 
   nwords = ngotos * tokensetsize;
   F = NEW2(nwords, unsigned);
@@ -401,23 +401,23 @@ initialize_F()
 void
 build_relations()
 {
-  register int i;
-  register int j;
-  register int k;
-  register short *rulep;
-  register short *rp;
-  register shifts *sp;
-  register int length;
-  register int nedges;
-  register int done;
-  register int state1;
-  register int stateno;
-  register int symbol1;
-  register int symbol2;
-  register short *shortp;
-  register short *edge;
-  register short *states;
-  register short **new_includes;
+  int i;
+  int j;
+  int k;
+  short *rulep;
+  short *rp;
+  shifts *sp;
+  int length;
+  int nedges;
+  int done;
+  int state1;
+  int stateno;
+  int symbol1;
+  int symbol2;
+  short *shortp;
+  short *edge;
+  short *states;
+  short **new_includes;
 
   includes = NEW2(ngotos, short *);
   edge = NEW2(ngotos + 1, short);
@@ -494,9 +494,9 @@ void
 add_lookback_edge(stateno, ruleno, gotono)
 int stateno, ruleno, gotono;
 {
-    register int i, k;
-    register int found;
-    register shorts *sp;
+    int i, k;
+    int found;
+    shorts *sp;
 
     i = lookaheads[stateno];
     k = lookaheads[stateno + 1];
@@ -523,12 +523,12 @@ transpose(R, n)
 short **R;
 int n;
 {
-  register short **new_R;
-  register short **temp_R;
-  register short *nedges;
-  register short *sp;
-  register int i;
-  register int k;
+  short **new_R;
+  short **temp_R;
+  short *nedges;
+  short *sp;
+  int i;
+  int k;
 
   nedges = NEW2(n, short);
 
@@ -584,10 +584,10 @@ compute_FOLLOWS()
 void
 compute_lookaheads()
 {
-  register int i, n;
-  register unsigned *fp1, *fp2, *fp3;
-  register shorts *sp, *next;
-  register unsigned *rowp;
+  int i, n;
+  unsigned *fp1, *fp2, *fp3;
+  shorts *sp, *next;
+  unsigned *rowp;
 
   rowp = LA;
   n = lookaheads[nstates];
@@ -619,7 +619,7 @@ void
 digraph(relation)
 short **relation;
 {
-  register int i;
+  int i;
 
   infinity = ngotos + 2;
   INDEX = NEW2(ngotos + 1, short);
@@ -644,13 +644,13 @@ short **relation;
 
 void
 traverse(i)
-register int i;
+int i;
 {
-  register unsigned *fp1;
-  register unsigned *fp2;
-  register unsigned *fp3;
-  register int j;
-  register short *rp;
+  unsigned *fp1;
+  unsigned *fp2;
+  unsigned *fp3;
+  int j;
+  short *rp;
 
   int height;
   unsigned *base;
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 73078c50535..4fbdb6f46b9 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lr0.c,v 1.4 2001/07/16 06:29:44 pvalchev Exp $	*/
+/*	$OpenBSD: lr0.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: lr0.c,v 1.4 1996/03/19 03:21:35 jtc Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
 #else
-static char rcsid[] = "$OpenBSD: lr0.c,v 1.4 2001/07/16 06:29:44 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: lr0.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -97,13 +97,13 @@ static short *kernel_items;
 void
 allocate_itemsets()
 {
-    register short *itemp;
-    register short *item_end;
-    register int symbol;
-    register int i;
-    register int count;
-    register int max;
-    register short *symbol_count;
+    short *itemp;
+    short *item_end;
+    int symbol;
+    int i;
+    int count;
+    int max;
+    short *symbol_count;
 
     count = 0;
     symbol_count = NEW2(nsyms, short);
@@ -148,9 +148,9 @@ allocate_storage()
 void
 append_states()
 {
-    register int i;
-    register int j;
-    register int symbol;
+    int i;
+    int j;
+    int symbol;
 
 #ifdef	TRACE
     fprintf(stderr, "Entering append_states()\n");
@@ -219,13 +219,13 @@ int
 get_state(symbol)
 int symbol;
 {
-    register int key;
-    register short *isp1;
-    register short *isp2;
-    register short *iend;
-    register core *sp;
-    register int found;
-    register int n;
+    int key;
+    short *isp1;
+    short *isp2;
+    short *iend;
+    core *sp;
+    int found;
+    int n;
 
 #ifdef	TRACE
     fprintf(stderr, "Entering get_state(%d)\n", symbol);
@@ -282,9 +282,9 @@ int symbol;
 void
 initialize_states()
 {
-    register int i;
-    register short *start_derives;
-    register core *p;
+    int i;
+    short *start_derives;
+    core *p;
 
     start_derives = derives[start_symbol];
     for (i = 0; start_derives[i] >= 0; ++i)
@@ -309,11 +309,11 @@ initialize_states()
 void
 new_itemsets()
 {
-    register int i;
-    register int shiftcount;
-    register short *isp;
-    register short *ksp;
-    register int symbol;
+    int i;
+    int shiftcount;
+    short *isp;
+    short *ksp;
+    int symbol;
 
     for (i = 0; i < nsyms; i++)
 	kernel_end[i] = 0;
@@ -347,11 +347,11 @@ core *
 new_state(symbol)
 int symbol;
 {
-    register int n;
-    register core *p;
-    register short *isp1;
-    register short *isp2;
-    register short *iend;
+    int n;
+    core *p;
+    short *isp1;
+    short *isp2;
+    short *iend;
 
 #ifdef	TRACE
     fprintf(stderr, "Entering new_state(%d)\n", symbol);
@@ -465,10 +465,10 @@ show_shifts()
 void
 save_shifts()
 {
-    register shifts *p;
-    register short *sp1;
-    register short *sp2;
-    register short *send;
+    shifts *p;
+    short *sp1;
+    short *sp2;
+    short *send;
 
     p = (shifts *) allocate((unsigned) (sizeof(shifts) +
 			(nshifts - 1) * sizeof(short)));
@@ -499,13 +499,13 @@ save_shifts()
 void
 save_reductions()
 {
-    register short *isp;
-    register short *rp1;
-    register short *rp2;
-    register int item;
-    register int count;
-    register reductions *p;
-    register short *rend;
+    short *isp;
+    short *rp1;
+    short *rp2;
+    int item;
+    int count;
+    reductions *p;
+    short *rend;
 
     count = 0;
     for (isp = itemset; isp < itemsetend; isp++)
@@ -548,9 +548,9 @@ save_reductions()
 void
 set_derives()
 {
-    register int i, k;
-    register int lhs;
-    register short *rules;
+    int i, k;
+    int lhs;
+    short *rules;
 
     derives = NEW2(nsyms, short *);
     rules = NEW2(nvars + nrules, short);
@@ -587,8 +587,8 @@ free_derives()
 void
 print_derives()
 {
-    register int i;
-    register short *sp;
+    int i;
+    short *sp;
 
     printf("\nDERIVES\n\n");
 
@@ -609,8 +609,8 @@ print_derives()
 void
 set_nullable()
 {
-    register int i, j;
-    register int empty;
+    int i, j;
+    int empty;
     int done;
 
     nullable = MALLOC(nsyms);
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 6839b076928..a5341fa95a7 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.13 2001/11/07 11:42:53 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.14 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: main.c,v 1.5 1996/03/19 03:21:38 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.13 2001/11/07 11:42:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.14 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -119,7 +119,7 @@ char *nullable;
 void onintr __P((int));
 void set_signals __P((void));
 void usage __P((void));
-void getargs __P((int, register char *[]));
+void getargs __P((int, char *[]));
 void create_file_names __P((void));
 void open_files __P((void));
 
@@ -181,8 +181,8 @@ getargs(argc, argv)
 int argc;
 char *argv[];
 {
-    register int i;
-    register char *s;
+    int i;
+    char *s;
 
     for (i = 1; i < argc; ++i)
     {
@@ -295,7 +295,7 @@ char *
 allocate(n)
 unsigned n;
 {
-    register char *p;
+    char *p;
 
     p = NULL;
     if (n)
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 585f63b678a..64422e5d797 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkpar.c,v 1.6 2001/07/16 06:29:44 pvalchev Exp $	*/
+/*	$OpenBSD: mkpar.c,v 1.7 2001/11/19 19:02:18 mpech Exp $	*/
 
 /*	$NetBSD: mkpar.c,v 1.4 1996/03/19 03:21:39 jtc Exp $	*/
 
@@ -80,7 +80,7 @@ void defreds __P((void));
 void
 make_parser()
 {
-    register int i;
+    int i;
 
     parser = NEW2(nstates, action *);
     for (i = 0; i < nstates; i++)
@@ -96,9 +96,9 @@ make_parser()
 
 action *
 parse_actions(stateno)
-register int stateno;
+int stateno;
 {
-    register action *actions;
+    action *actions;
 
     actions = get_shifts(stateno);
     actions = add_reductions(stateno, actions);
@@ -110,11 +110,11 @@ action *
 get_shifts(stateno)
 int stateno;
 {
-    register action *actions, *temp;
-    register shifts *sp;
-    register short *to_state;
-    register int i, k;
-    register int symbol;
+    action *actions, *temp;
+    shifts *sp;
+    short *to_state;
+    int i, k;
+    int symbol;
 
     actions = 0;
     sp = shift_table[stateno];
@@ -144,11 +144,11 @@ int stateno;
 action *
 add_reductions(stateno, actions)
 int stateno;
-register action *actions;
+action *actions;
 {
-    register int i, j, m, n;
-    register int ruleno, tokensetsize;
-    register unsigned *rowp;
+    int i, j, m, n;
+    int ruleno, tokensetsize;
+    unsigned *rowp;
 
     tokensetsize = WORDSIZE(ntokens);
     m = lookaheads[stateno];
@@ -169,10 +169,10 @@ register action *actions;
 
 action *
 add_reduce(actions, ruleno, symbol)
-register action *actions;
-register int ruleno, symbol;
+action *actions;
+int ruleno, symbol;
 {
-    register action *temp, *prev, *next;
+    action *temp, *prev, *next;
 
     prev = 0;
     for (next = actions; next && next->symbol < symbol; next = next->next)
@@ -211,9 +211,9 @@ register int ruleno, symbol;
 void
 find_final_state()
 {
-    register int goal, i;
-    register short *to_state;
-    register shifts *p;
+    int goal, i;
+    short *to_state;
+    shifts *p;
 
     p = shift_table[0];
     to_state = p->shift;
@@ -229,8 +229,8 @@ find_final_state()
 void
 unused_rules()
 {
-    register int i;
-    register action *p;
+    int i;
+    action *p;
 
     rules_used = (short *) MALLOC(nrules*sizeof(short));
     if (rules_used == 0) no_space();
@@ -264,9 +264,9 @@ unused_rules()
 void
 remove_conflicts()
 {
-    register int i;
-    register int symbol;
-    register action *p, *pref;
+    int i;
+    int symbol;
+    action *p, *pref;
 
     SRtotal = 0;
     RRtotal = 0;
@@ -362,8 +362,8 @@ int
 sole_reduction(stateno)
 int stateno;
 {
-    register int count, ruleno;
-    register action *p;
+    int count, ruleno;
+    action *p;
 
     count = 0;
     ruleno = 0; 
@@ -390,7 +390,7 @@ int stateno;
 void
 defreds()
 {
-    register int i;
+    int i;
 
     defred = NEW2(nstates, short);
     for (i = 0; i < nstates; i++)
@@ -399,9 +399,9 @@ defreds()
  
 void
 free_action_row(p)
-register action *p;
+action *p;
 {
-  register action *q;
+  action *q;
 
   while (p)
     {
@@ -414,7 +414,7 @@ register action *p;
 void
 free_parser()
 {
-  register int i;
+  int i;
 
   for (i = 0; i < nstates; i++)
     free_action_row(parser[i]);
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 3e87105f41c..f23db33a112 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: output.c,v 1.6 2001/07/16 06:29:45 pvalchev Exp $	*/
+/*	$OpenBSD: output.c,v 1.7 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: output.c,v 1.4 1996/03/19 03:21:41 jtc Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
 #else
-static char rcsid[] = "$OpenBSD: output.c,v 1.6 2001/07/16 06:29:45 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: output.c,v 1.7 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -181,8 +181,8 @@ output_prefix()
 void
 output_rule_data()
 {
-    register int i;
-    register int j;
+    int i;
+    int j;
 
   
     fprintf(output_file, "short %slhs[] = {%42d,", symbol_prefix,
@@ -229,7 +229,7 @@ output_rule_data()
 void
 output_yydefred()
 {
-    register int i, j;
+    int i, j;
 
     fprintf(output_file, "short %sdefred[] = {%39d,", symbol_prefix,
 	    (defred[0] ? defred[0] - 2 : 0));
@@ -286,11 +286,11 @@ output_actions()
 void
 token_actions()
 {
-    register int i, j;
-    register int shiftcount, reducecount;
-    register int max, min;
-    register short *actionrow, *r, *s;
-    register action *p;
+    int i, j;
+    int shiftcount, reducecount;
+    int max, min;
+    short *actionrow, *r, *s;
+    action *p;
 
     actionrow = NEW2(2*ntokens, short);
     for (i = 0; i < nstates; ++i)
@@ -371,7 +371,7 @@ token_actions()
 void
 goto_actions()
 {
-    register int i, j, k;
+    int i, j, k;
 
     state_count = NEW2(nstates, short);
 
@@ -405,11 +405,11 @@ int
 default_goto(symbol)
 int symbol;
 {
-    register int i;
-    register int m;
-    register int n;
-    register int default_state;
-    register int max;
+    int i;
+    int m;
+    int n;
+    int default_state;
+    int max;
 
     m = goto_map[symbol];
     n = goto_map[symbol + 1];
@@ -443,14 +443,14 @@ save_column(symbol, default_state)
 int symbol;
 int default_state;
 {
-    register int i;
-    register int m;
-    register int n;
-    register short *sp;
-    register short *sp1;
-    register short *sp2;
-    register int count;
-    register int symno;
+    int i;
+    int m;
+    int n;
+    short *sp;
+    short *sp1;
+    short *sp2;
+    int count;
+    int symno;
 
     m = goto_map[symbol];
     n = goto_map[symbol + 1];
@@ -484,11 +484,11 @@ int default_state;
 void
 sort_actions()
 {
-  register int i;
-  register int j;
-  register int k;
-  register int t;
-  register int w;
+  int i;
+  int j;
+  int k;
+  int t;
+  int w;
 
   order = NEW2(nvectors, short);
   nentries = 0;
@@ -520,9 +520,9 @@ sort_actions()
 void
 pack_table()
 {
-    register int i;
-    register int place;
-    register int state;
+    int i;
+    int place;
+    int state;
 
     base = NEW2(nvectors, short);
     pos = NEW2(nentries, short);
@@ -584,13 +584,13 @@ int
 matching_vector(vector)
 int vector;
 {
-    register int i;
-    register int j;
-    register int k;
-    register int t;
-    register int w;
-    register int match;
-    register int prev;
+    int i;
+    int j;
+    int k;
+    int t;
+    int w;
+    int match;
+    int prev;
 
     i = order[vector];
     if (i >= 2*nstates)
@@ -625,12 +625,12 @@ int
 pack_vector(vector)
 int vector;
 {
-    register int i, j, k, l;
-    register int t;
-    register int loc;
-    register int ok;
-    register short *from;
-    register short *to;
+    int i, j, k, l;
+    int t;
+    int loc;
+    int ok;
+    short *from;
+    short *to;
     int newmax;
 
     i = order[vector];
@@ -702,7 +702,7 @@ int vector;
 void
 output_base()
 {
-    register int i, j;
+    int i, j;
 
     fprintf(output_file, "short %ssindex[] = {%39d,", symbol_prefix, base[0]);
 
@@ -769,8 +769,8 @@ output_base()
 void
 output_table()
 {
-    register int i;
-    register int j;
+    int i;
+    int j;
 
     ++outline;
     fprintf(code_file, "#define YYTABLESIZE %d\n", high);
@@ -802,8 +802,8 @@ output_table()
 void
 output_check()
 {
-    register int i;
-    register int j;
+    int i;
+    int j;
 
     fprintf(output_file, "short %scheck[] = {%40d,", symbol_prefix,
 	    check[0]);
@@ -833,8 +833,8 @@ int
 is_C_identifier(name)
 char *name;
 {
-    register char *s;
-    register int c;
+    char *s;
+    int c;
 
     s = name;
     c = *s;
@@ -865,8 +865,8 @@ char *name;
 void
 output_defines()
 {
-    register int c, i;
-    register char *s;
+    int c, i;
+    char *s;
 
     for (i = 2; i < ntokens; ++i)
     {
@@ -918,8 +918,8 @@ output_defines()
 void
 output_stored_text()
 {
-    register int c;
-    register FILE *in, *out;
+    int c;
+    FILE *in, *out;
 
     fclose(text_file);
     text_file = fopen(text_file_name, "r");
@@ -946,7 +946,7 @@ output_stored_text()
 void
 output_debug()
 {
-    register int i, j, k, max;
+    int i, j, k, max;
     char **symnam, *s;
 
     ++outline;
@@ -1172,8 +1172,8 @@ output_stype()
 void
 output_trailing_text()
 {
-    register int c, last;
-    register FILE *in, *out;
+    int c, last;
+    FILE *in, *out;
 
     if (line == 0)
 	return;
@@ -1230,8 +1230,8 @@ output_trailing_text()
 void
 output_semantic_actions()
 {
-    register int c, last;
-    register FILE *out;
+    int c, last;
+    FILE *out;
 
     fclose(action_file);
     action_file = fopen(action_file_name, "r");
@@ -1268,7 +1268,7 @@ output_semantic_actions()
 void
 free_itemsets()
 {
-    register core *cp, *next;
+    core *cp, *next;
 
     FREE(state_table);
     for (cp = first_state; cp; cp = next)
@@ -1282,7 +1282,7 @@ free_itemsets()
 void
 free_shifts()
 {
-    register shifts *sp, *next;
+    shifts *sp, *next;
 
     FREE(shift_table);
     for (sp = first_shift; sp; sp = next)
@@ -1297,7 +1297,7 @@ free_shifts()
 void
 free_reductions()
 {
-    register reductions *rp, *next;
+    reductions *rp, *next;
 
     FREE(reduction_table);
     for (rp = first_reduction; rp; rp = next)
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index ac44ebb0f76..67caf3ca5c9 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reader.c,v 1.8 2001/07/16 06:29:45 pvalchev Exp $	*/
+/*	$OpenBSD: reader.c,v 1.9 2001/11/19 19:02:18 mpech Exp $	*/
 
 /*	$NetBSD: reader.c,v 1.5 1996/03/19 03:21:43 jtc Exp $	*/
 
@@ -138,9 +138,9 @@ int c;
 void
 get_line()
 {
-    register FILE *f = input_file;
-    register int c;
-    register int i;
+    FILE *f = input_file;
+    int c;
+    int i;
 
     if (saw_eof || (c = getc(f)) == EOF)
     {
@@ -185,7 +185,7 @@ get_line()
 char *
 dup_line()
 {
-    register char *p, *s, *t;
+    char *p, *s, *t;
 
     if (line == 0) return (0);
     s = line;
@@ -203,7 +203,7 @@ dup_line()
 void
 skip_comment()
 {
-    register char *s;
+    char *s;
 
     int st_lineno = lineno;
     char *st_line = dup_line();
@@ -234,7 +234,7 @@ skip_comment()
 int
 nextc()
 {
-    register char *s;
+    char *s;
 
     if (line == 0)
     {
@@ -296,7 +296,7 @@ nextc()
 int
 keyword()
 {
-    register int c;
+    int c;
     char *t_cptr = cptr;
 
     c = *++cptr;
@@ -362,8 +362,8 @@ keyword()
 void
 copy_ident()
 {
-    register int c;
-    register FILE *f = output_file;
+    int c;
+    FILE *f = output_file;
 
     c = nextc();
     if (c == EOF) unexpected_EOF();
@@ -392,9 +392,9 @@ copy_ident()
 void
 copy_text()
 {
-    register int c;
+    int c;
     int quote;
-    register FILE *f = text_file;
+    FILE *f = text_file;
     int need_newline = 0;
     int t_lineno = lineno;
     char *t_line = dup_line();
@@ -524,7 +524,7 @@ loop:
 void
 copy_union()
 {
-    register int c;
+    int c;
     int quote;
     int depth;
     int u_lineno = lineno;
@@ -679,11 +679,11 @@ int c;
 bucket *
 get_literal()
 {
-    register int c, quote;
-    register int i;
-    register int n;
-    register char *s;
-    register bucket *bp;
+    int c, quote;
+    int i;
+    int n;
+    char *s;
+    bucket *bp;
     int s_lineno = lineno;
     char *s_line = dup_line();
     char *s_cptr = s_line + (cptr - line);
@@ -840,7 +840,7 @@ char *name;
 bucket *
 get_name()
 {
-    register int c;
+    int c;
 
     cinc = 0;
     for (c = *cptr; IS_IDENT(c); c = *++cptr)
@@ -856,8 +856,8 @@ get_name()
 int
 get_number()
 {
-    register int c;
-    register int n;
+    int c;
+    int n;
 
     n = 0;
     for (c = *cptr; isdigit(c); c = *++cptr)
@@ -870,9 +870,9 @@ get_number()
 char *
 get_tag()
 {
-    register int c;
-    register int i;
-    register char *s;
+    int c;
+    int i;
+    char *s;
     int t_lineno = lineno;
     char *t_line = dup_line();
     char *t_cptr = t_line + (cptr - line);
@@ -922,8 +922,8 @@ void
 declare_tokens(assoc)
 int assoc;
 {
-    register int c;
-    register bucket *bp;
+    int c;
+    bucket *bp;
     int value;
     char *tag = 0;
 
@@ -990,7 +990,7 @@ void
 declare_expect(assoc)
 int assoc;
 {
-    register int c;
+    int c;
 
     if (assoc != EXPECT) ++prec;
 
@@ -1029,8 +1029,8 @@ int assoc;
 void
 declare_types()
 {
-    register int c;
-    register bucket *bp;
+    int c;
+    bucket *bp;
     char *tag;
 
     c = nextc();
@@ -1058,8 +1058,8 @@ declare_types()
 void
 declare_start()
 {
-    register int c;
-    register bucket *bp;
+    int c;
+    bucket *bp;
 
     c = nextc();
     if (c == EOF) unexpected_EOF();
@@ -1077,7 +1077,7 @@ declare_start()
 void
 read_declarations()
 {
-    register int c, k;
+    int c, k;
 
     cache_size = 256;
     cache = MALLOC(cache_size);
@@ -1185,8 +1185,8 @@ expand_rules()
 void
 advance_to_start()
 {
-    register int c;
-    register bucket *bp;
+    int c;
+    bucket *bp;
     char *s_cptr;
     int s_lineno;
 
@@ -1235,7 +1235,7 @@ advance_to_start()
 
 void
 start_rule(bp, s_lineno)
-register bucket *bp;
+bucket *bp;
 int s_lineno;
 {
     if (bp->class == TERM)
@@ -1252,7 +1252,7 @@ int s_lineno;
 void
 end_rule()
 {
-    register int i;
+    int i;
 
     if (!last_was_action && plhs[nrules]->tag)
     {
@@ -1272,7 +1272,7 @@ end_rule()
 void
 insert_empty_rule()
 {
-    register bucket *bp, **bpp;
+    bucket *bp, **bpp;
 
     assert(cache);
     sprintf(cache, "$$%d", ++gensym);
@@ -1302,8 +1302,8 @@ insert_empty_rule()
 void
 add_symbol()
 {
-    register int c;
-    register bucket *bp;
+    int c;
+    bucket *bp;
     int s_lineno = lineno;
 
     c = *cptr;
@@ -1334,12 +1334,12 @@ add_symbol()
 void
 copy_action()
 {
-    register int c;
-    register int i, n;
+    int c;
+    int i, n;
     int depth;
     int quote;
     char *tag;
-    register FILE *f = action_file;
+    FILE *f = action_file;
     int a_lineno = lineno;
     char *a_line = dup_line();
     char *a_cptr = a_line + (cptr - line);
@@ -1560,8 +1560,8 @@ loop:
 int
 mark_symbol()
 {
-    register int c;
-    register bucket *bp;
+    int c;
+    bucket *bp;
 
     c = cptr[1];
     if (c == '%' || c == '\\')
@@ -1604,7 +1604,7 @@ mark_symbol()
 void
 read_grammar()
 {
-    register int c;
+    int c;
 
     initialize_grammar();
     advance_to_start();
@@ -1638,7 +1638,7 @@ read_grammar()
 void
 free_tags()
 {
-    register int i;
+    int i;
 
     if (tag_table == 0) return;
 
@@ -1654,8 +1654,8 @@ free_tags()
 void
 pack_names()
 {
-    register bucket *bp;
-    register char *p, *s, *t;
+    bucket *bp;
+    char *p, *s, *t;
 
     name_pool_size = 13;  /* 13 == sizeof("$end") + sizeof("$accept") */
     for (bp = first_symbol; bp; bp = bp->next)
@@ -1680,7 +1680,7 @@ pack_names()
 void
 check_symbols()
 {
-    register bucket *bp;
+    bucket *bp;
 
     if (goal->class == UNKNOWN)
 	undefined_goal(goal->name);
@@ -1699,9 +1699,9 @@ check_symbols()
 void
 pack_symbols()
 {
-    register bucket *bp;
-    register bucket **v;
-    register int i, j, k, n;
+    bucket *bp;
+    bucket **v;
+    int i, j, k, n;
 
     nsyms = 2;
     ntokens = 1;
@@ -1824,7 +1824,7 @@ pack_symbols()
 void
 pack_grammar()
 {
-    register int i, j;
+    int i, j;
     int assoc, prec;
 
     ritem = (short *) MALLOC(nitems*sizeof(short));
@@ -1884,9 +1884,9 @@ pack_grammar()
 void
 print_grammar()
 {
-    register int i, j, k;
+    int i, j, k;
     int spacing;
-    register FILE *f = verbose_file;
+    FILE *f = verbose_file;
 
     if (!vflag) return;
 
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index ba8dfd955de..befa6759c67 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skeleton.c,v 1.17 2001/07/16 06:29:45 pvalchev Exp $	*/
+/*	$OpenBSD: skeleton.c,v 1.18 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: skeleton.c,v 1.10 1996/03/25 00:36:18 mrg Exp $	*/
 
 /*
@@ -67,7 +67,7 @@ char *banner[] =
     "#if __GNUC__ == 2",
     "  __attribute__ ((unused))",
     "#endif /* __GNUC__ == 2 */",
-    "  = \"$OpenBSD: skeleton.c,v 1.17 2001/07/16 06:29:45 pvalchev Exp $\";",
+    "  = \"$OpenBSD: skeleton.c,v 1.18 2001/11/19 19:02:18 mpech Exp $\";",
     "#endif",
     "#include <stdlib.h>",
     "#define YYBYACC 1",
@@ -193,12 +193,12 @@ char *body[] =
     "yyparse()",
     "#endif",
     "{",
-    "    register int yym, yyn, yystate;",
+    "    int yym, yyn, yystate;",
     "#if YYDEBUG",
     "#if defined(__cplusplus) || __STDC__",
-    "    register const char *yys;",
+    "    const char *yys;",
     "#else /* !(defined(__cplusplus) || __STDC__) */",
-    "    register char *yys;",
+    "    char *yys;",
     "#endif /* !(defined(__cplusplus) || __STDC__) */",
     "",
     "    if ((yys = getenv(\"YYDEBUG\")))",
@@ -402,10 +402,10 @@ void
 write_section(section)
 char *section[];
 {
-    register int c;
-    register int i;
-    register char *s;
-    register FILE *f;
+    int c;
+    int i;
+    char *s;
+    FILE *f;
 
     f = code_file;
     for (i = 0; (s = section[i]); ++i)
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index 472ea1dc9b0..55af445774a 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: symtab.c,v 1.4 2001/07/16 06:29:45 pvalchev Exp $	*/
+/*	$OpenBSD: symtab.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: symtab.c,v 1.4 1996/03/19 03:21:48 jtc Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
 #else
-static char rcsid[] = "$OpenBSD: symtab.c,v 1.4 2001/07/16 06:29:45 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: symtab.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,8 +64,8 @@ int
 hash(name)
 char *name;
 {
-    register char *s;
-    register int c, k;
+    char *s;
+    int c, k;
 
     assert(name && *name);
     s = name;
@@ -81,7 +81,7 @@ bucket *
 make_bucket(name)
 char *name;
 {
-    register bucket *bp;
+    bucket *bp;
 
     assert(name);
     bp = (bucket *) MALLOC(sizeof(bucket));
@@ -108,7 +108,7 @@ bucket *
 lookup(name)
 char *name;
 {
-    register bucket *bp, **bpp;
+    bucket *bp, **bpp;
 
     bpp = symbol_table + hash(name);
     bp = *bpp;
@@ -131,8 +131,8 @@ char *name;
 void
 create_symbol_table()
 {
-    register int i;
-    register bucket *bp;
+    int i;
+    bucket *bp;
 
     symbol_table = (bucket **) MALLOC(TABLE_SIZE*sizeof(bucket *));
     if (symbol_table == 0) no_space();
@@ -160,7 +160,7 @@ free_symbol_table()
 void
 free_symbols()
 {
-    register bucket *p, *q;
+    bucket *p, *q;
 
     for (p = first_symbol; p; p = q)
     {
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 0628b3ea976..b839f841634 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: verbose.c,v 1.4 2001/07/16 06:29:45 pvalchev Exp $	*/
+/*	$OpenBSD: verbose.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: verbose.c,v 1.4 1996/03/19 03:21:50 jtc Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
 #else
-static char rcsid[] = "$OpenBSD: verbose.c,v 1.4 2001/07/16 06:29:45 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: verbose.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -63,7 +63,7 @@ void print_gotos __P((int));
 void
 verbose()
 {
-    register int i;
+    int i;
 
     if (!vflag) return;
 
@@ -88,8 +88,8 @@ verbose()
 void
 log_unused()
 {
-    register int i;
-    register short *p;
+    int i;
+    short *p;
 
     fprintf(verbose_file, "\n\nRules never reduced:\n");
     for (i = 3; i < nrules; ++i)
@@ -108,7 +108,7 @@ log_unused()
 void
 log_conflicts()
 {
-    register int i;
+    int i;
 
     fprintf(verbose_file, "\n\n");
     for (i = 0; i < nstates; i++)
@@ -153,8 +153,8 @@ void
 print_conflicts(state)
 int state;
 {
-    register int symbol, act, number;
-    register action *p;
+    int symbol, act, number;
+    action *p;
 
     symbol = -1;
     for (p = parser[state]; p; p = p->next)
@@ -202,12 +202,12 @@ void
 print_core(state)
 int state;
 {
-    register int i;
-    register int k;
-    register int rule;
-    register core *statep;
-    register short *sp;
-    register short *sp1;
+    int i;
+    int k;
+    int rule;
+    core *statep;
+    short *sp;
+    short *sp1;
 
     statep = state_table[state];
     k = statep->nitems;
@@ -239,8 +239,8 @@ void
 print_nulls(state)
 int state;
 {
-    register action *p;
-    register int i, j, k, nnulls;
+    action *p;
+    int i, j, k, nnulls;
 
     nnulls = 0;
     for (p = parser[state]; p; p = p->next)
@@ -284,9 +284,9 @@ void
 print_actions(stateno)
 int stateno;
 {
-    register action *p;
-    register shifts *sp;
-    register int as;
+    action *p;
+    shifts *sp;
+    int as;
 
     if (stateno == final_state)
 	fprintf(verbose_file, "\t$end  accept\n");
@@ -310,10 +310,10 @@ int stateno;
 
 void
 print_shifts(p)
-register action *p;
+action *p;
 {
-    register int count;
-    register action *q;
+    int count;
+    action *q;
 
     count = 0;
     for (q = p; q; q = q->next)
@@ -336,11 +336,11 @@ register action *p;
 
 void
 print_reductions(p, defred)
-register action *p;
-register int defred;
+action *p;
+int defred;
 {
-    register int k, anyreds;
-    register action *q;
+    int k, anyreds;
+    action *q;
 
     anyreds = 0;
     for (q = p; q ; q = q->next)
@@ -377,10 +377,10 @@ void
 print_gotos(stateno)
 int stateno;
 {
-    register int i, k;
-    register int as;
-    register short *to_state;
-    register shifts *sp;
+    int i, k;
+    int as;
+    short *to_state;
+    shifts *sp;
 
     putc('\n', verbose_file);
     sp = shift_table[stateno];
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index e2e3639b2f5..9677de917c4 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: warshall.c,v 1.4 2001/07/16 06:29:45 pvalchev Exp $	*/
+/*	$OpenBSD: warshall.c,v 1.5 2001/11/19 19:02:18 mpech Exp $	*/
 /*	$NetBSD: warshall.c,v 1.4 1996/03/19 03:21:51 jtc Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
 #else
-static char rcsid[] = "$OpenBSD: warshall.c,v 1.4 2001/07/16 06:29:45 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: warshall.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -54,15 +54,15 @@ transitive_closure(R, n)
 unsigned *R;
 int n;
 {
-    register int rowsize;
-    register unsigned i;
-    register unsigned *rowj;
-    register unsigned *rp;
-    register unsigned *rend;
-    register unsigned *ccol;
-    register unsigned *relend;
-    register unsigned *cword;
-    register unsigned *rowi;
+    int rowsize;
+    unsigned i;
+    unsigned *rowj;
+    unsigned *rp;
+    unsigned *rend;
+    unsigned *ccol;
+    unsigned *relend;
+    unsigned *cword;
+    unsigned *rowi;
 
     rowsize = WORDSIZE(n);
     relend = R + n*rowsize;
@@ -107,10 +107,10 @@ reflexive_transitive_closure(R, n)
 unsigned *R;
 int n;
 {
-    register int rowsize;
-    register unsigned i;
-    register unsigned *rp;
-    register unsigned *relend;
+    int rowsize;
+    unsigned i;
+    unsigned *rp;
+    unsigned *relend;
 
     transitive_closure(R, n);