From 50c922602db1d78ff209809c00b9c30fbfe5ea6c Mon Sep 17 00:00:00 2001
From: downsj <downsj@openbsd.org>
Date: Tue, 25 Feb 1997 00:03:49 +0000
Subject: [PATCH] Reimport NetBSD version w/ Todd's changes, new rcsids, and
 the beginings of some source cleaning by me.

This undoes Theo's wait() changes which broke the old version.
---
 usr.bin/window/Makefile      |  3 ++-
 usr.bin/window/README        |  2 +-
 usr.bin/window/alias.h       |  2 +-
 usr.bin/window/char.c        |  4 ++--
 usr.bin/window/char.h        |  2 +-
 usr.bin/window/cmd.c         |  4 ++--
 usr.bin/window/cmd1.c        |  4 ++--
 usr.bin/window/cmd2.c        |  4 ++--
 usr.bin/window/cmd3.c        |  4 ++--
 usr.bin/window/cmd4.c        |  4 ++--
 usr.bin/window/cmd5.c        |  4 ++--
 usr.bin/window/cmd6.c        |  4 ++--
 usr.bin/window/cmd7.c        |  4 ++--
 usr.bin/window/compress.c    |  6 ++++--
 usr.bin/window/context.c     |  4 ++--
 usr.bin/window/context.h     |  2 +-
 usr.bin/window/defs.h        |  2 +-
 usr.bin/window/error.c       |  4 ++--
 usr.bin/window/lcmd.c        |  4 ++--
 usr.bin/window/lcmd.h        |  2 +-
 usr.bin/window/lcmd1.c       |  4 ++--
 usr.bin/window/lcmd2.c       |  4 ++--
 usr.bin/window/local.h       |  2 +-
 usr.bin/window/main.c        |  6 ++++--
 usr.bin/window/mloop.c       |  4 ++--
 usr.bin/window/parser.h      |  2 +-
 usr.bin/window/parser1.c     |  4 ++--
 usr.bin/window/parser2.c     |  4 ++--
 usr.bin/window/parser3.c     |  4 ++--
 usr.bin/window/parser4.c     |  4 ++--
 usr.bin/window/parser5.c     |  4 ++--
 usr.bin/window/scanner.c     |  4 ++--
 usr.bin/window/startup.c     |  5 +++--
 usr.bin/window/string.c      |  4 ++--
 usr.bin/window/string.h      |  2 +-
 usr.bin/window/token.h       |  2 +-
 usr.bin/window/tt.h          |  2 +-
 usr.bin/window/ttf100.c      |  4 ++--
 usr.bin/window/ttgeneric.c   |  4 ++--
 usr.bin/window/tth19.c       |  4 ++--
 usr.bin/window/tth29.c       |  4 ++--
 usr.bin/window/ttinit.c      |  5 +++--
 usr.bin/window/ttoutput.c    |  4 ++--
 usr.bin/window/tttermcap.c   |  4 ++--
 usr.bin/window/tttvi925.c    |  4 ++--
 usr.bin/window/ttwyse60.c    |  4 ++--
 usr.bin/window/ttwyse75.c    |  4 ++--
 usr.bin/window/ttzapple.c    |  4 ++--
 usr.bin/window/ttzentec.c    |  4 ++--
 usr.bin/window/value.h       |  2 +-
 usr.bin/window/var.c         |  4 ++--
 usr.bin/window/var.h         |  2 +-
 usr.bin/window/win.c         |  4 ++--
 usr.bin/window/window.1      |  2 +-
 usr.bin/window/windowrc      |  4 ++--
 usr.bin/window/ww.h          | 14 ++------------
 usr.bin/window/wwadd.c       |  4 ++--
 usr.bin/window/wwalloc.c     |  4 ++--
 usr.bin/window/wwbox.c       |  4 ++--
 usr.bin/window/wwchild.c     |  4 ++--
 usr.bin/window/wwclose.c     |  4 ++--
 usr.bin/window/wwclreol.c    |  4 ++--
 usr.bin/window/wwclreos.c    |  4 ++--
 usr.bin/window/wwcursor.c    |  4 ++--
 usr.bin/window/wwdata.c      |  4 ++--
 usr.bin/window/wwdelchar.c   |  4 ++--
 usr.bin/window/wwdelete.c    |  4 ++--
 usr.bin/window/wwdelline.c   |  4 ++--
 usr.bin/window/wwdump.c      |  4 ++--
 usr.bin/window/wwend.c       |  4 ++--
 usr.bin/window/wwenviron.c   |  4 ++--
 usr.bin/window/wwerror.c     |  4 ++--
 usr.bin/window/wwflush.c     |  4 ++--
 usr.bin/window/wwframe.c     |  4 ++--
 usr.bin/window/wwgets.c      |  4 ++--
 usr.bin/window/wwinit.c      |  6 ++++--
 usr.bin/window/wwinschar.c   |  4 ++--
 usr.bin/window/wwinsline.c   |  4 ++--
 usr.bin/window/wwiomux.c     |  4 ++--
 usr.bin/window/wwlabel.c     |  4 ++--
 usr.bin/window/wwmisc.c      |  4 ++--
 usr.bin/window/wwmove.c      |  4 ++--
 usr.bin/window/wwopen.c      |  5 +++--
 usr.bin/window/wwprintf.c    |  4 ++--
 usr.bin/window/wwpty.c       |  4 ++--
 usr.bin/window/wwputc.c      |  4 ++--
 usr.bin/window/wwputs.c      |  4 ++--
 usr.bin/window/wwredraw.c    |  4 ++--
 usr.bin/window/wwredrawwin.c |  4 ++--
 usr.bin/window/wwrint.c      |  4 ++--
 usr.bin/window/wwscroll.c    |  4 ++--
 usr.bin/window/wwsize.c      |  4 ++--
 usr.bin/window/wwspawn.c     |  6 ++----
 usr.bin/window/wwsuspend.c   |  4 ++--
 usr.bin/window/wwterminfo.c  |  9 ++++++---
 usr.bin/window/wwtty.c       |  4 ++--
 usr.bin/window/wwunframe.c   |  4 ++--
 usr.bin/window/wwupdate.c    |  4 ++--
 usr.bin/window/wwwrite.c     |  4 ++--
 usr.bin/window/xx.c          |  5 +++--
 usr.bin/window/xx.h          |  2 +-
 usr.bin/window/xxflush.c     |  4 ++--
 102 files changed, 203 insertions(+), 201 deletions(-)

diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index 33806b368ac..150d2cbf99e 100644
--- a/usr.bin/window/Makefile
+++ b/usr.bin/window/Makefile
@@ -1,5 +1,6 @@
-#	$OpenBSD: Makefile,v 1.3 1996/06/26 05:43:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/02/25 00:03:49 downsj Exp $
 #	$NetBSD: Makefile,v 1.6 1995/12/21 05:24:49 mycroft Exp $
+#	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	window
 SRCS=	char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
diff --git a/usr.bin/window/README b/usr.bin/window/README
index 2612b69bb9d..6178f183b2d 100644
--- a/usr.bin/window/README
+++ b/usr.bin/window/README
@@ -1,4 +1,4 @@
-/*	$OpenBSD: README,v 1.2 1996/06/26 05:43:04 deraadt Exp $	*/
+/*	$OpenBSD: README,v 1.3 1997/02/25 00:03:51 downsj Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
diff --git a/usr.bin/window/alias.h b/usr.bin/window/alias.h
index f6db0b6bdf9..8a9c4a3fd79 100644
--- a/usr.bin/window/alias.h
+++ b/usr.bin/window/alias.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alias.h,v 1.2 1996/06/26 05:43:05 deraadt Exp $	*/
+/*	$OpenBSD: alias.h,v 1.3 1997/02/25 00:03:52 downsj Exp $	*/
 /*	$NetBSD: alias.h,v 1.3 1995/09/28 10:33:59 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/char.c b/usr.bin/window/char.c
index 4392ebb483f..ec485db4b4f 100644
--- a/usr.bin/window/char.c
+++ b/usr.bin/window/char.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: char.c,v 1.2 1996/06/26 05:43:05 deraadt Exp $	*/
+/*	$OpenBSD: char.c,v 1.3 1997/02/25 00:03:53 downsj Exp $	*/
 /*	$NetBSD: char.c,v 1.3 1995/09/28 10:34:00 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)char.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: char.c,v 1.2 1996/06/26 05:43:05 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: char.c,v 1.3 1997/02/25 00:03:53 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/char.h b/usr.bin/window/char.h
index d46c2efa325..7a0af7d354b 100644
--- a/usr.bin/window/char.h
+++ b/usr.bin/window/char.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: char.h,v 1.2 1996/06/26 05:43:06 deraadt Exp $	*/
+/*	$OpenBSD: char.h,v 1.3 1997/02/25 00:03:53 downsj Exp $	*/
 /*	$NetBSD: char.h,v 1.3 1995/09/28 10:34:01 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/cmd.c b/usr.bin/window/cmd.c
index 3526f0a009d..08ac97d0682 100644
--- a/usr.bin/window/cmd.c
+++ b/usr.bin/window/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.3 1996/06/26 05:43:06 deraadt Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.4 1997/02/25 00:03:54 downsj 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.3 1996/06/26 05:43:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmd.c,v 1.4 1997/02/25 00:03:54 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/cmd1.c b/usr.bin/window/cmd1.c
index 41613489f42..fa628b838f9 100644
--- a/usr.bin/window/cmd1.c
+++ b/usr.bin/window/cmd1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd1.c,v 1.3 1996/06/26 05:43:07 deraadt Exp $	*/
+/*	$OpenBSD: cmd1.c,v 1.4 1997/02/25 00:03:55 downsj 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.3 1996/06/26 05:43:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmd1.c,v 1.4 1997/02/25 00:03:55 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/cmd2.c b/usr.bin/window/cmd2.c
index 94e962a3767..b372e049d90 100644
--- a/usr.bin/window/cmd2.c
+++ b/usr.bin/window/cmd2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd2.c,v 1.2 1996/06/26 05:43:07 deraadt Exp $	*/
+/*	$OpenBSD: cmd2.c,v 1.3 1997/02/25 00:03:56 downsj 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.2 1996/06/26 05:43:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmd2.c,v 1.3 1997/02/25 00:03:56 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/cmd3.c b/usr.bin/window/cmd3.c
index 7203771096a..5b5a42d60cd 100644
--- a/usr.bin/window/cmd3.c
+++ b/usr.bin/window/cmd3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd3.c,v 1.2 1996/06/26 05:43:08 deraadt Exp $	*/
+/*	$OpenBSD: cmd3.c,v 1.3 1997/02/25 00:03:57 downsj 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.2 1996/06/26 05:43:08 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmd3.c,v 1.3 1997/02/25 00:03:57 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/cmd4.c b/usr.bin/window/cmd4.c
index 643b89add35..06dcd0ed421 100644
--- a/usr.bin/window/cmd4.c
+++ b/usr.bin/window/cmd4.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd4.c,v 1.2 1996/06/26 05:43:09 deraadt Exp $	*/
+/*	$OpenBSD: cmd4.c,v 1.3 1997/02/25 00:03:58 downsj Exp $	*/
 /*	$NetBSD: cmd4.c,v 1.3 1995/09/28 10:34:08 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd4.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: cmd4.c,v 1.2 1996/06/26 05:43:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmd4.c,v 1.3 1997/02/25 00:03:58 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/cmd5.c b/usr.bin/window/cmd5.c
index 27be19c6abd..d8b232a145f 100644
--- a/usr.bin/window/cmd5.c
+++ b/usr.bin/window/cmd5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd5.c,v 1.2 1996/06/26 05:43:09 deraadt Exp $	*/
+/*	$OpenBSD: cmd5.c,v 1.3 1997/02/25 00:03:59 downsj 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.2 1996/06/26 05:43:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmd5.c,v 1.3 1997/02/25 00:03:59 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/cmd6.c b/usr.bin/window/cmd6.c
index 5bfa962729c..4198f5dd9a5 100644
--- a/usr.bin/window/cmd6.c
+++ b/usr.bin/window/cmd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd6.c,v 1.2 1996/06/26 05:43:10 deraadt Exp $	*/
+/*	$OpenBSD: cmd6.c,v 1.3 1997/02/25 00:04:00 downsj 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.2 1996/06/26 05:43:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmd6.c,v 1.3 1997/02/25 00:04:00 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/cmd7.c b/usr.bin/window/cmd7.c
index cc675ac47c5..611fd2aac50 100644
--- a/usr.bin/window/cmd7.c
+++ b/usr.bin/window/cmd7.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd7.c,v 1.2 1996/06/26 05:43:10 deraadt Exp $	*/
+/*	$OpenBSD: cmd7.c,v 1.3 1997/02/25 00:04:00 downsj 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.2 1996/06/26 05:43:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmd7.c,v 1.3 1997/02/25 00:04:00 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/compress.c b/usr.bin/window/compress.c
index a88773067af..73e2a8c4dcb 100644
--- a/usr.bin/window/compress.c
+++ b/usr.bin/window/compress.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compress.c,v 1.2 1996/06/26 05:43:11 deraadt Exp $	*/
+/*	$OpenBSD: compress.c,v 1.3 1997/02/25 00:04:01 downsj Exp $	*/
 /*	$NetBSD: compress.c,v 1.3 1995/09/28 10:34:13 tls Exp $	*/
 
 /*
@@ -41,10 +41,12 @@
 #if 0
 static char sccsid[] = "@(#)compress.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: compress.c,v 1.2 1996/06/26 05:43:11 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: compress.c,v 1.3 1997/02/25 00:04:01 downsj Exp $";
 #endif
 #endif /* not lint */
 
+#include <stdlib.h>
+
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/context.c b/usr.bin/window/context.c
index f6dbdcdd09f..d9925413b86 100644
--- a/usr.bin/window/context.c
+++ b/usr.bin/window/context.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: context.c,v 1.2 1996/06/26 05:43:11 deraadt Exp $	*/
+/*	$OpenBSD: context.c,v 1.3 1997/02/25 00:04:02 downsj 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.2 1996/06/26 05:43:11 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: context.c,v 1.3 1997/02/25 00:04:02 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/context.h b/usr.bin/window/context.h
index d0b9a8cf3d7..e184b71e3e0 100644
--- a/usr.bin/window/context.h
+++ b/usr.bin/window/context.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: context.h,v 1.2 1996/06/26 05:43:12 deraadt Exp $	*/
+/*	$OpenBSD: context.h,v 1.3 1997/02/25 00:04:03 downsj Exp $	*/
 /*	$NetBSD: context.h,v 1.3 1995/09/28 10:34:17 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/defs.h b/usr.bin/window/defs.h
index e4dbcc0e245..691f8f8de34 100644
--- a/usr.bin/window/defs.h
+++ b/usr.bin/window/defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: defs.h,v 1.2 1996/06/26 05:43:13 deraadt Exp $	*/
+/*	$OpenBSD: defs.h,v 1.3 1997/02/25 00:04:03 downsj Exp $	*/
 /*	$NetBSD: defs.h,v 1.3 1995/09/28 10:34:19 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/error.c b/usr.bin/window/error.c
index 8c52f019545..9a4421dbc7b 100644
--- a/usr.bin/window/error.c
+++ b/usr.bin/window/error.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: error.c,v 1.2 1996/06/26 05:43:13 deraadt Exp $	*/
+/*	$OpenBSD: error.c,v 1.3 1997/02/25 00:04:04 downsj 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.2 1996/06/26 05:43:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.3 1997/02/25 00:04:04 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/lcmd.c b/usr.bin/window/lcmd.c
index e89f7296f87..d3e69952fd3 100644
--- a/usr.bin/window/lcmd.c
+++ b/usr.bin/window/lcmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcmd.c,v 1.2 1996/06/26 05:43:14 deraadt Exp $	*/
+/*	$OpenBSD: lcmd.c,v 1.3 1997/02/25 00:04:05 downsj 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.2 1996/06/26 05:43:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lcmd.c,v 1.3 1997/02/25 00:04:05 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/lcmd.h b/usr.bin/window/lcmd.h
index 481ebdd3679..e82f85eb829 100644
--- a/usr.bin/window/lcmd.h
+++ b/usr.bin/window/lcmd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcmd.h,v 1.2 1996/06/26 05:43:14 deraadt Exp $	*/
+/*	$OpenBSD: lcmd.h,v 1.3 1997/02/25 00:04:06 downsj Exp $	*/
 /*	$NetBSD: lcmd.h,v 1.3 1995/09/28 10:34:22 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/lcmd1.c b/usr.bin/window/lcmd1.c
index 4618724713a..683eb2b04fd 100644
--- a/usr.bin/window/lcmd1.c
+++ b/usr.bin/window/lcmd1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcmd1.c,v 1.4 1997/01/17 07:13:51 millert Exp $	*/
+/*	$OpenBSD: lcmd1.c,v 1.5 1997/02/25 00:04:07 downsj 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.4 1997/01/17 07:13:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: lcmd1.c,v 1.5 1997/02/25 00:04:07 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index 6a012bbcd97..e7eb4684734 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcmd2.c,v 1.3 1997/01/17 07:13:52 millert Exp $	*/
+/*	$OpenBSD: lcmd2.c,v 1.4 1997/02/25 00:04:08 downsj 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.3 1997/01/17 07:13:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.4 1997/02/25 00:04:08 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/local.h b/usr.bin/window/local.h
index 4cf31ffa3f6..06fd8b55c08 100644
--- a/usr.bin/window/local.h
+++ b/usr.bin/window/local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.h,v 1.2 1996/06/26 05:43:16 deraadt Exp $	*/
+/*	$OpenBSD: local.h,v 1.3 1997/02/25 00:04:08 downsj Exp $	*/
 /*	$NetBSD: local.h,v 1.3 1995/09/28 10:34:26 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index 422a5ef0390..aa3c8d28fd5 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.5 1997/01/17 07:13:52 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.6 1997/02/25 00:04:09 downsj Exp $	*/
 /*	$NetBSD: main.c,v 1.6 1996/02/08 20:45:01 mycroft Exp $	*/
 
 /*
@@ -47,13 +47,15 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.5 1997/01/17 07:13:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.6 1997/02/25 00:04:09 downsj Exp $";
 #endif
 #endif /* not lint */
 
 #include "defs.h"
 #include <paths.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "string.h"
 #include "char.h"
 #include "local.h"
diff --git a/usr.bin/window/mloop.c b/usr.bin/window/mloop.c
index bfa3878d70e..95c213e8d02 100644
--- a/usr.bin/window/mloop.c
+++ b/usr.bin/window/mloop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mloop.c,v 1.4 1996/06/26 05:43:17 deraadt Exp $	*/
+/*	$OpenBSD: mloop.c,v 1.5 1997/02/25 00:04:10 downsj 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.4 1996/06/26 05:43:17 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mloop.c,v 1.5 1997/02/25 00:04:10 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/parser.h b/usr.bin/window/parser.h
index 8f0229cc692..f38260dc612 100644
--- a/usr.bin/window/parser.h
+++ b/usr.bin/window/parser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.h,v 1.2 1996/06/26 05:43:18 deraadt Exp $	*/
+/*	$OpenBSD: parser.h,v 1.3 1997/02/25 00:04:11 downsj Exp $	*/
 /*	$NetBSD: parser.h,v 1.3 1995/09/28 10:34:29 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/parser1.c b/usr.bin/window/parser1.c
index 69959ee5c48..9bc1e3e281c 100644
--- a/usr.bin/window/parser1.c
+++ b/usr.bin/window/parser1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser1.c,v 1.2 1996/06/26 05:43:18 deraadt Exp $	*/
+/*	$OpenBSD: parser1.c,v 1.3 1997/02/25 00:04:11 downsj 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.2 1996/06/26 05:43:18 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: parser1.c,v 1.3 1997/02/25 00:04:11 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/parser2.c b/usr.bin/window/parser2.c
index 1b1927a18bc..f8e5b13f433 100644
--- a/usr.bin/window/parser2.c
+++ b/usr.bin/window/parser2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser2.c,v 1.2 1996/06/26 05:43:19 deraadt Exp $	*/
+/*	$OpenBSD: parser2.c,v 1.3 1997/02/25 00:04:12 downsj 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.2 1996/06/26 05:43:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: parser2.c,v 1.3 1997/02/25 00:04:12 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/parser3.c b/usr.bin/window/parser3.c
index 18319e4efc0..f7b1c9685bb 100644
--- a/usr.bin/window/parser3.c
+++ b/usr.bin/window/parser3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser3.c,v 1.2 1996/06/26 05:43:19 deraadt Exp $	*/
+/*	$OpenBSD: parser3.c,v 1.3 1997/02/25 00:04:13 downsj 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.2 1996/06/26 05:43:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: parser3.c,v 1.3 1997/02/25 00:04:13 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/parser4.c b/usr.bin/window/parser4.c
index 0b4681536a2..1b61b6b6da8 100644
--- a/usr.bin/window/parser4.c
+++ b/usr.bin/window/parser4.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser4.c,v 1.2 1996/06/26 05:43:20 deraadt Exp $	*/
+/*	$OpenBSD: parser4.c,v 1.3 1997/02/25 00:04:14 downsj 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.2 1996/06/26 05:43:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: parser4.c,v 1.3 1997/02/25 00:04:14 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/parser5.c b/usr.bin/window/parser5.c
index aed4fa07f6f..d4ff123f5a9 100644
--- a/usr.bin/window/parser5.c
+++ b/usr.bin/window/parser5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser5.c,v 1.2 1996/06/26 05:43:20 deraadt Exp $	*/
+/*	$OpenBSD: parser5.c,v 1.3 1997/02/25 00:04:15 downsj 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.2 1996/06/26 05:43:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: parser5.c,v 1.3 1997/02/25 00:04:15 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index be848514ee7..f9d681b9621 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scanner.c,v 1.2 1996/06/26 05:43:21 deraadt Exp $	*/
+/*	$OpenBSD: scanner.c,v 1.3 1997/02/25 00:04:16 downsj 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.2 1996/06/26 05:43:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: scanner.c,v 1.3 1997/02/25 00:04:16 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/startup.c b/usr.bin/window/startup.c
index 88cb4209b2e..c7822d6c73d 100644
--- a/usr.bin/window/startup.c
+++ b/usr.bin/window/startup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: startup.c,v 1.3 1996/06/26 05:43:21 deraadt Exp $	*/
+/*	$OpenBSD: startup.c,v 1.4 1997/02/25 00:04:17 downsj Exp $	*/
 /*	$NetBSD: startup.c,v 1.4 1996/02/08 20:45:04 mycroft Exp $	*/
 
 /*
@@ -41,11 +41,12 @@
 #if 0
 static char sccsid[] = "@(#)startup.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: startup.c,v 1.3 1996/06/26 05:43:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: startup.c,v 1.4 1997/02/25 00:04:17 downsj Exp $";
 #endif
 #endif /* not lint */
 
 #include "defs.h"
+#include <stdlib.h>
 #include "value.h"
 #include "var.h"
 #include "char.h"
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c
index 061aad2ff7b..8764dfafe2a 100644
--- a/usr.bin/window/string.c
+++ b/usr.bin/window/string.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: string.c,v 1.2 1996/06/26 05:43:22 deraadt Exp $	*/
+/*	$OpenBSD: string.c,v 1.3 1997/02/25 00:04:18 downsj 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.2 1996/06/26 05:43:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: string.c,v 1.3 1997/02/25 00:04:18 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/string.h b/usr.bin/window/string.h
index 9017531894c..5e6355b1ce8 100644
--- a/usr.bin/window/string.h
+++ b/usr.bin/window/string.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: string.h,v 1.2 1996/06/26 05:43:23 deraadt Exp $	*/
+/*	$OpenBSD: string.h,v 1.3 1997/02/25 00:04:18 downsj Exp $	*/
 /*	$NetBSD: string.h,v 1.3 1995/09/28 10:34:40 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/token.h b/usr.bin/window/token.h
index f0b890054d6..1b77e96062c 100644
--- a/usr.bin/window/token.h
+++ b/usr.bin/window/token.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: token.h,v 1.2 1996/06/26 05:43:23 deraadt Exp $	*/
+/*	$OpenBSD: token.h,v 1.3 1997/02/25 00:04:19 downsj Exp $	*/
 /*	$NetBSD: token.h,v 1.3 1995/09/28 10:34:41 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/tt.h b/usr.bin/window/tt.h
index d1c445f4686..196815af4f9 100644
--- a/usr.bin/window/tt.h
+++ b/usr.bin/window/tt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tt.h,v 1.2 1996/06/26 05:43:24 deraadt Exp $	*/
+/*	$OpenBSD: tt.h,v 1.3 1997/02/25 00:04:20 downsj Exp $	*/
 /*	$NetBSD: tt.h,v 1.3 1995/09/28 10:34:42 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/ttf100.c b/usr.bin/window/ttf100.c
index 0fcac078697..85bdfe46e3c 100644
--- a/usr.bin/window/ttf100.c
+++ b/usr.bin/window/ttf100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttf100.c,v 1.2 1996/06/26 05:43:24 deraadt Exp $	*/
+/*	$OpenBSD: ttf100.c,v 1.3 1997/02/25 00:04:21 downsj Exp $	*/
 /*	$NetBSD: ttf100.c,v 1.3 1995/09/28 10:34:44 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)ttf100.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: ttf100.c,v 1.2 1996/06/26 05:43:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ttf100.c,v 1.3 1997/02/25 00:04:21 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/ttgeneric.c b/usr.bin/window/ttgeneric.c
index 237af4b0904..fba09acdada 100644
--- a/usr.bin/window/ttgeneric.c
+++ b/usr.bin/window/ttgeneric.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttgeneric.c,v 1.2 1996/06/26 05:43:25 deraadt Exp $	*/
+/*	$OpenBSD: ttgeneric.c,v 1.3 1997/02/25 00:04:22 downsj 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.2 1996/06/26 05:43:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ttgeneric.c,v 1.3 1997/02/25 00:04:22 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/tth19.c b/usr.bin/window/tth19.c
index 3aa904e55af..7f76b7f4af8 100644
--- a/usr.bin/window/tth19.c
+++ b/usr.bin/window/tth19.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tth19.c,v 1.2 1996/06/26 05:43:25 deraadt Exp $	*/
+/*	$OpenBSD: tth19.c,v 1.3 1997/02/25 00:04:22 downsj 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.2 1996/06/26 05:43:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tth19.c,v 1.3 1997/02/25 00:04:22 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/tth29.c b/usr.bin/window/tth29.c
index 97dcacd06ca..b912ac31474 100644
--- a/usr.bin/window/tth29.c
+++ b/usr.bin/window/tth29.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tth29.c,v 1.2 1996/06/26 05:43:26 deraadt Exp $	*/
+/*	$OpenBSD: tth29.c,v 1.3 1997/02/25 00:04:23 downsj 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.2 1996/06/26 05:43:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tth29.c,v 1.3 1997/02/25 00:04:23 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/ttinit.c b/usr.bin/window/ttinit.c
index 0ab44cbf50b..d13549c948b 100644
--- a/usr.bin/window/ttinit.c
+++ b/usr.bin/window/ttinit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttinit.c,v 1.2 1996/06/26 05:43:26 deraadt Exp $	*/
+/*	$OpenBSD: ttinit.c,v 1.3 1997/02/25 00:04:24 downsj Exp $	*/
 /*	$NetBSD: ttinit.c,v 1.3 1995/09/28 10:34:50 tls Exp $	*/
 
 /*
@@ -41,10 +41,11 @@
 #if 0
 static char sccsid[] = "@(#)ttinit.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: ttinit.c,v 1.2 1996/06/26 05:43:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ttinit.c,v 1.3 1997/02/25 00:04:24 downsj Exp $";
 #endif
 #endif /* not lint */
 
+#include <stdlib.h>
 #include "ww.h"
 #include "tt.h"
 
diff --git a/usr.bin/window/ttoutput.c b/usr.bin/window/ttoutput.c
index 2b662489761..1b62364cea5 100644
--- a/usr.bin/window/ttoutput.c
+++ b/usr.bin/window/ttoutput.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttoutput.c,v 1.2 1996/06/26 05:43:27 deraadt Exp $	*/
+/*	$OpenBSD: ttoutput.c,v 1.3 1997/02/25 00:04:25 downsj 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.2 1996/06/26 05:43:27 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ttoutput.c,v 1.3 1997/02/25 00:04:25 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index 8d110580bb1..ec54aabd7f3 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tttermcap.c,v 1.2 1996/06/26 05:43:27 deraadt Exp $	*/
+/*	$OpenBSD: tttermcap.c,v 1.3 1997/02/25 00:04:25 downsj 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.2 1996/06/26 05:43:27 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tttermcap.c,v 1.3 1997/02/25 00:04:25 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/tttvi925.c b/usr.bin/window/tttvi925.c
index a47c194333b..9b50d8085c1 100644
--- a/usr.bin/window/tttvi925.c
+++ b/usr.bin/window/tttvi925.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tttvi925.c,v 1.2 1996/06/26 05:43:28 deraadt Exp $	*/
+/*	$OpenBSD: tttvi925.c,v 1.3 1997/02/25 00:04:26 downsj Exp $	*/
 /*	$NetBSD: tttvi925.c,v 1.3 1995/09/28 10:34:54 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)tttvi925.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: tttvi925.c,v 1.2 1996/06/26 05:43:28 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tttvi925.c,v 1.3 1997/02/25 00:04:26 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/ttwyse60.c b/usr.bin/window/ttwyse60.c
index 3b457e73b21..e3c208c4241 100644
--- a/usr.bin/window/ttwyse60.c
+++ b/usr.bin/window/ttwyse60.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttwyse60.c,v 1.2 1996/06/26 05:43:28 deraadt Exp $	*/
+/*	$OpenBSD: ttwyse60.c,v 1.3 1997/02/25 00:04:27 downsj Exp $	*/
 /*	$NetBSD: ttwyse60.c,v 1.3 1995/09/28 10:34:55 tls Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 #if 0
 static char sccsid[] = "@(#)ttwyse60.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: ttwyse60.c,v 1.2 1996/06/26 05:43:28 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ttwyse60.c,v 1.3 1997/02/25 00:04:27 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/ttwyse75.c b/usr.bin/window/ttwyse75.c
index 91b095103a4..d63fb6fb04c 100644
--- a/usr.bin/window/ttwyse75.c
+++ b/usr.bin/window/ttwyse75.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttwyse75.c,v 1.2 1996/06/26 05:43:29 deraadt Exp $	*/
+/*	$OpenBSD: ttwyse75.c,v 1.3 1997/02/25 00:04:28 downsj Exp $	*/
 /*	$NetBSD: ttwyse75.c,v 1.3 1995/09/28 10:34:56 tls Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 #if 0
 static char sccsid[] = "@(#)ttwyse75.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: ttwyse75.c,v 1.2 1996/06/26 05:43:29 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ttwyse75.c,v 1.3 1997/02/25 00:04:28 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/ttzapple.c b/usr.bin/window/ttzapple.c
index 481faa7df66..917b4b5c900 100644
--- a/usr.bin/window/ttzapple.c
+++ b/usr.bin/window/ttzapple.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttzapple.c,v 1.2 1996/06/26 05:43:30 deraadt Exp $	*/
+/*	$OpenBSD: ttzapple.c,v 1.3 1997/02/25 00:04:28 downsj 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.2 1996/06/26 05:43:30 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ttzapple.c,v 1.3 1997/02/25 00:04:28 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/ttzentec.c b/usr.bin/window/ttzentec.c
index 5bbee9cbb4e..fdfe8259cca 100644
--- a/usr.bin/window/ttzentec.c
+++ b/usr.bin/window/ttzentec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttzentec.c,v 1.2 1996/06/26 05:43:30 deraadt Exp $	*/
+/*	$OpenBSD: ttzentec.c,v 1.3 1997/02/25 00:04:29 downsj Exp $	*/
 /*	$NetBSD: ttzentec.c,v 1.3 1995/09/28 10:34:58 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)ttzentec.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: ttzentec.c,v 1.2 1996/06/26 05:43:30 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ttzentec.c,v 1.3 1997/02/25 00:04:29 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/value.h b/usr.bin/window/value.h
index 60d959bff53..cb6d1c71ab5 100644
--- a/usr.bin/window/value.h
+++ b/usr.bin/window/value.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: value.h,v 1.2 1996/06/26 05:43:31 deraadt Exp $	*/
+/*	$OpenBSD: value.h,v 1.3 1997/02/25 00:04:30 downsj Exp $	*/
 /*	$NetBSD: value.h,v 1.3 1995/09/28 10:35:00 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/var.c b/usr.bin/window/var.c
index 0b06ff144b1..bf5bd128414 100644
--- a/usr.bin/window/var.c
+++ b/usr.bin/window/var.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: var.c,v 1.2 1996/06/26 05:43:31 deraadt Exp $	*/
+/*	$OpenBSD: var.c,v 1.3 1997/02/25 00:04:31 downsj 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.2 1996/06/26 05:43:31 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: var.c,v 1.3 1997/02/25 00:04:31 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/var.h b/usr.bin/window/var.h
index 3545cd5b43b..018a3ab4375 100644
--- a/usr.bin/window/var.h
+++ b/usr.bin/window/var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: var.h,v 1.2 1996/06/26 05:43:32 deraadt Exp $	*/
+/*	$OpenBSD: var.h,v 1.3 1997/02/25 00:04:32 downsj Exp $	*/
 /*	$NetBSD: var.h,v 1.3 1995/09/28 10:35:02 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/win.c b/usr.bin/window/win.c
index 64565e9ce6a..d3054490fc3 100644
--- a/usr.bin/window/win.c
+++ b/usr.bin/window/win.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: win.c,v 1.4 1996/06/26 05:43:32 deraadt Exp $	*/
+/*	$OpenBSD: win.c,v 1.5 1997/02/25 00:04:32 downsj 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.4 1996/06/26 05:43:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: win.c,v 1.5 1997/02/25 00:04:32 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 4d1882f6d56..3f1a57e705e 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: window.1,v 1.2 1996/06/26 05:43:33 deraadt Exp $
+.\"	$OpenBSD: window.1,v 1.3 1997/02/25 00:04:34 downsj Exp $
 .\"	$NetBSD: window.1,v 1.3 1995/09/28 10:35:05 tls Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
diff --git a/usr.bin/window/windowrc b/usr.bin/window/windowrc
index fe0b5208cdd..cee29e1ce36 100644
--- a/usr.bin/window/windowrc
+++ b/usr.bin/window/windowrc
@@ -1,5 +1,5 @@
-#	$OpenBSD: windowrc,v 1.2 1996/06/26 05:43:34 deraadt Exp $
-
+#	$OpenBSD: windowrc,v 1.3 1997/02/25 00:04:35 downsj Exp $
+#
 # Copyright (c) 1983, 1993
 #	The Regents of the University of California.  All rights reserved.
 #
diff --git a/usr.bin/window/ww.h b/usr.bin/window/ww.h
index e4236bd947e..1b9298d9c5d 100644
--- a/usr.bin/window/ww.h
+++ b/usr.bin/window/ww.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: ww.h,v 1.5 1996/11/25 13:12:19 niklas Exp $	*/
-/*	$NetBSD: ww.h,v 1.8 1996/02/08 21:48:51 mycroft Exp $	*/
+/*	$OpenBSD: ww.h,v 1.6 1997/02/25 00:04:36 downsj Exp $	*/
+/*	$NetBSD: ww.h,v 1.9 1996/10/12 23:46:23 christos Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -46,7 +46,6 @@
 #endif
 #include <setjmp.h>
 #include <sys/types.h>
-#include <machine/endian.h>
 
 #define NWW	30		/* maximum number of windows */
 
@@ -316,15 +315,6 @@ void wwquit();
 char **wwalloc();
 char *wwerror();
 
-	/* c library functions */
-char *malloc();
-char *calloc();
-char *getenv();
-char *tgetstr();
-char *rindex();
-char *strcpy();
-char *strcat();
-
 #undef MIN
 #undef MAX
 #define MIN(x, y)	((x) > (y) ? (y) : (x))
diff --git a/usr.bin/window/wwadd.c b/usr.bin/window/wwadd.c
index 01ad76aa943..086a982becb 100644
--- a/usr.bin/window/wwadd.c
+++ b/usr.bin/window/wwadd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwadd.c,v 1.3 1996/06/26 05:43:35 deraadt Exp $	*/
+/*	$OpenBSD: wwadd.c,v 1.4 1997/02/25 00:04:37 downsj 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.3 1996/06/26 05:43:35 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwadd.c,v 1.4 1997/02/25 00:04:37 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwalloc.c b/usr.bin/window/wwalloc.c
index 89fdb449694..9a647e85d97 100644
--- a/usr.bin/window/wwalloc.c
+++ b/usr.bin/window/wwalloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwalloc.c,v 1.2 1996/06/26 05:43:35 deraadt Exp $	*/
+/*	$OpenBSD: wwalloc.c,v 1.3 1997/02/25 00:04:38 downsj 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.2 1996/06/26 05:43:35 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwalloc.c,v 1.3 1997/02/25 00:04:38 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwbox.c b/usr.bin/window/wwbox.c
index 5371f73e109..def654980f8 100644
--- a/usr.bin/window/wwbox.c
+++ b/usr.bin/window/wwbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwbox.c,v 1.2 1996/06/26 05:43:36 deraadt Exp $	*/
+/*	$OpenBSD: wwbox.c,v 1.3 1997/02/25 00:04:39 downsj 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.2 1996/06/26 05:43:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwbox.c,v 1.3 1997/02/25 00:04:39 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwchild.c b/usr.bin/window/wwchild.c
index 47a0518a5ec..218feefcade 100644
--- a/usr.bin/window/wwchild.c
+++ b/usr.bin/window/wwchild.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwchild.c,v 1.2 1996/06/26 05:43:36 deraadt Exp $	*/
+/*	$OpenBSD: wwchild.c,v 1.3 1997/02/25 00:04:41 downsj 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.2 1996/06/26 05:43:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwchild.c,v 1.3 1997/02/25 00:04:41 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwclose.c b/usr.bin/window/wwclose.c
index d4cf4ee1cc7..4ca529a3942 100644
--- a/usr.bin/window/wwclose.c
+++ b/usr.bin/window/wwclose.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwclose.c,v 1.2 1996/06/26 05:43:37 deraadt Exp $	*/
+/*	$OpenBSD: wwclose.c,v 1.3 1997/02/25 00:04:42 downsj Exp $	*/
 /*	$NetBSD: wwclose.c,v 1.3 1995/09/28 10:35:14 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwclose.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwclose.c,v 1.2 1996/06/26 05:43:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwclose.c,v 1.3 1997/02/25 00:04:42 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwclreol.c b/usr.bin/window/wwclreol.c
index 78e82a65ada..ffa3b7e922e 100644
--- a/usr.bin/window/wwclreol.c
+++ b/usr.bin/window/wwclreol.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwclreol.c,v 1.3 1996/06/26 05:43:37 deraadt Exp $	*/
+/*	$OpenBSD: wwclreol.c,v 1.4 1997/02/25 00:04:43 downsj 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.3 1996/06/26 05:43:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwclreol.c,v 1.4 1997/02/25 00:04:43 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwclreos.c b/usr.bin/window/wwclreos.c
index a57b6f51072..87a8900acf7 100644
--- a/usr.bin/window/wwclreos.c
+++ b/usr.bin/window/wwclreos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwclreos.c,v 1.3 1996/06/26 05:43:38 deraadt Exp $	*/
+/*	$OpenBSD: wwclreos.c,v 1.4 1997/02/25 00:04:43 downsj 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.3 1996/06/26 05:43:38 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwclreos.c,v 1.4 1997/02/25 00:04:43 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwcursor.c b/usr.bin/window/wwcursor.c
index 5d19d5e6feb..af942c8757a 100644
--- a/usr.bin/window/wwcursor.c
+++ b/usr.bin/window/wwcursor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwcursor.c,v 1.3 1996/06/26 05:43:38 deraadt Exp $	*/
+/*	$OpenBSD: wwcursor.c,v 1.4 1997/02/25 00:04:44 downsj Exp $	*/
 /*	$NetBSD: wwcursor.c,v 1.4 1996/02/08 20:45:08 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwcursor.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwcursor.c,v 1.3 1996/06/26 05:43:38 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwcursor.c,v 1.4 1997/02/25 00:04:44 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwdata.c b/usr.bin/window/wwdata.c
index fb6458bdccf..0b180d41717 100644
--- a/usr.bin/window/wwdata.c
+++ b/usr.bin/window/wwdata.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdata.c,v 1.2 1996/06/26 05:43:39 deraadt Exp $	*/
+/*	$OpenBSD: wwdata.c,v 1.3 1997/02/25 00:04:45 downsj Exp $	*/
 /*	$NetBSD: wwdata.c,v 1.3 1995/09/28 10:35:20 tls Exp $	*/
 
 /*
@@ -41,6 +41,6 @@
 #if 0
 static char sccsid[] = "@(#)wwdata.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwdata.c,v 1.2 1996/06/26 05:43:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwdata.c,v 1.3 1997/02/25 00:04:45 downsj Exp $";
 #endif
 #endif /* not lint */
diff --git a/usr.bin/window/wwdelchar.c b/usr.bin/window/wwdelchar.c
index 9aec8fb4e59..30086c8c310 100644
--- a/usr.bin/window/wwdelchar.c
+++ b/usr.bin/window/wwdelchar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdelchar.c,v 1.3 1996/06/26 05:43:39 deraadt Exp $	*/
+/*	$OpenBSD: wwdelchar.c,v 1.4 1997/02/25 00:04:46 downsj 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.3 1996/06/26 05:43:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwdelchar.c,v 1.4 1997/02/25 00:04:46 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwdelete.c b/usr.bin/window/wwdelete.c
index 5a92de11af7..f82a2fde592 100644
--- a/usr.bin/window/wwdelete.c
+++ b/usr.bin/window/wwdelete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdelete.c,v 1.3 1996/06/26 05:43:40 deraadt Exp $	*/
+/*	$OpenBSD: wwdelete.c,v 1.4 1997/02/25 00:04:47 downsj 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.3 1996/06/26 05:43:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwdelete.c,v 1.4 1997/02/25 00:04:47 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwdelline.c b/usr.bin/window/wwdelline.c
index fc879e0e519..970f44d6c1a 100644
--- a/usr.bin/window/wwdelline.c
+++ b/usr.bin/window/wwdelline.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdelline.c,v 1.2 1996/06/26 05:43:40 deraadt Exp $	*/
+/*	$OpenBSD: wwdelline.c,v 1.3 1997/02/25 00:04:47 downsj Exp $	*/
 /*	$NetBSD: wwdelline.c,v 1.3 1995/09/28 10:35:24 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwdelline.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwdelline.c,v 1.2 1996/06/26 05:43:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwdelline.c,v 1.3 1997/02/25 00:04:47 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwdump.c b/usr.bin/window/wwdump.c
index 31a632c0e96..2e49c24749e 100644
--- a/usr.bin/window/wwdump.c
+++ b/usr.bin/window/wwdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdump.c,v 1.2 1996/06/26 05:43:41 deraadt Exp $	*/
+/*	$OpenBSD: wwdump.c,v 1.3 1997/02/25 00:04:48 downsj 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.2 1996/06/26 05:43:41 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwdump.c,v 1.3 1997/02/25 00:04:48 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwend.c b/usr.bin/window/wwend.c
index afad2fa7d1f..b11917fff0e 100644
--- a/usr.bin/window/wwend.c
+++ b/usr.bin/window/wwend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwend.c,v 1.2 1996/06/26 05:43:41 deraadt Exp $	*/
+/*	$OpenBSD: wwend.c,v 1.3 1997/02/25 00:04:49 downsj Exp $	*/
 /*	$NetBSD: wwend.c,v 1.3 1995/09/28 10:35:26 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwend.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwend.c,v 1.2 1996/06/26 05:43:41 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwend.c,v 1.3 1997/02/25 00:04:49 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c
index ad7b973ea00..1e338d63f04 100644
--- a/usr.bin/window/wwenviron.c
+++ b/usr.bin/window/wwenviron.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwenviron.c,v 1.3 1996/06/26 05:43:41 deraadt Exp $	*/
+/*	$OpenBSD: wwenviron.c,v 1.4 1997/02/25 00:04:50 downsj 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.3 1996/06/26 05:43:41 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwenviron.c,v 1.4 1997/02/25 00:04:50 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwerror.c b/usr.bin/window/wwerror.c
index c2cfde01596..50eead803a5 100644
--- a/usr.bin/window/wwerror.c
+++ b/usr.bin/window/wwerror.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwerror.c,v 1.2 1996/06/26 05:43:42 deraadt Exp $	*/
+/*	$OpenBSD: wwerror.c,v 1.3 1997/02/25 00:04:51 downsj Exp $	*/
 /*	$NetBSD: wwerror.c,v 1.3 1995/09/28 10:35:29 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwerror.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwerror.c,v 1.2 1996/06/26 05:43:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwerror.c,v 1.3 1997/02/25 00:04:51 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwflush.c b/usr.bin/window/wwflush.c
index 64df995124d..86cc0aec9dc 100644
--- a/usr.bin/window/wwflush.c
+++ b/usr.bin/window/wwflush.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwflush.c,v 1.3 1996/06/26 05:43:42 deraadt Exp $	*/
+/*	$OpenBSD: wwflush.c,v 1.4 1997/02/25 00:04:52 downsj 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.3 1996/06/26 05:43:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwflush.c,v 1.4 1997/02/25 00:04:52 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwframe.c b/usr.bin/window/wwframe.c
index bcd6e9cfb6e..c25964a7ab2 100644
--- a/usr.bin/window/wwframe.c
+++ b/usr.bin/window/wwframe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwframe.c,v 1.3 1996/06/26 05:43:43 deraadt Exp $	*/
+/*	$OpenBSD: wwframe.c,v 1.4 1997/02/25 00:04:53 downsj 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.3 1996/06/26 05:43:43 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwframe.c,v 1.4 1997/02/25 00:04:53 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwgets.c b/usr.bin/window/wwgets.c
index e66b29b3184..14f94977d02 100644
--- a/usr.bin/window/wwgets.c
+++ b/usr.bin/window/wwgets.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwgets.c,v 1.3 1996/06/26 05:43:43 deraadt Exp $	*/
+/*	$OpenBSD: wwgets.c,v 1.4 1997/02/25 00:04:54 downsj 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.3 1996/06/26 05:43:43 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwgets.c,v 1.4 1997/02/25 00:04:54 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index 077862d00c7..825deb2a5ca 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwinit.c,v 1.4 1996/06/26 05:43:44 deraadt Exp $	*/
+/*	$OpenBSD: wwinit.c,v 1.5 1997/02/25 00:04:54 downsj Exp $	*/
 /*	$NetBSD: wwinit.c,v 1.11 1996/02/08 21:49:07 mycroft Exp $	*/
 
 /*
@@ -41,14 +41,16 @@
 #if 0
 static char sccsid[] = "@(#)wwinit.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: wwinit.c,v 1.4 1996/06/26 05:43:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwinit.c,v 1.5 1997/02/25 00:04:54 downsj Exp $";
 #endif
 #endif /* not lint */
 
+#include <stdlib.h>
 #include "ww.h"
 #include "tt.h"
 #include <sys/signal.h>
 #include <fcntl.h>
+#include <term.h>
 #include "char.h"
 
 wwinit()
diff --git a/usr.bin/window/wwinschar.c b/usr.bin/window/wwinschar.c
index 7a676a510b1..75b1db691bc 100644
--- a/usr.bin/window/wwinschar.c
+++ b/usr.bin/window/wwinschar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwinschar.c,v 1.3 1996/06/26 05:43:44 deraadt Exp $	*/
+/*	$OpenBSD: wwinschar.c,v 1.4 1997/02/25 00:04:55 downsj 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.3 1996/06/26 05:43:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwinschar.c,v 1.4 1997/02/25 00:04:55 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwinsline.c b/usr.bin/window/wwinsline.c
index 1b90e951700..7ecb2ed092d 100644
--- a/usr.bin/window/wwinsline.c
+++ b/usr.bin/window/wwinsline.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwinsline.c,v 1.2 1996/06/26 05:43:45 deraadt Exp $	*/
+/*	$OpenBSD: wwinsline.c,v 1.3 1997/02/25 00:04:56 downsj Exp $	*/
 /*	$NetBSD: wwinsline.c,v 1.3 1995/09/28 10:35:36 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwinsline.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwinsline.c,v 1.2 1996/06/26 05:43:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwinsline.c,v 1.3 1997/02/25 00:04:56 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwiomux.c b/usr.bin/window/wwiomux.c
index 433a136ef8c..e3b7a6281ad 100644
--- a/usr.bin/window/wwiomux.c
+++ b/usr.bin/window/wwiomux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwiomux.c,v 1.4 1996/06/26 05:43:45 deraadt Exp $	*/
+/*	$OpenBSD: wwiomux.c,v 1.5 1997/02/25 00:04:57 downsj 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.4 1996/06/26 05:43:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwiomux.c,v 1.5 1997/02/25 00:04:57 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwlabel.c b/usr.bin/window/wwlabel.c
index 0e32612ddfb..69b745edc87 100644
--- a/usr.bin/window/wwlabel.c
+++ b/usr.bin/window/wwlabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwlabel.c,v 1.3 1996/06/26 05:43:46 deraadt Exp $	*/
+/*	$OpenBSD: wwlabel.c,v 1.4 1997/02/25 00:04:58 downsj 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.3 1996/06/26 05:43:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwlabel.c,v 1.4 1997/02/25 00:04:58 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwmisc.c b/usr.bin/window/wwmisc.c
index 868482760d4..d74d3eae3f5 100644
--- a/usr.bin/window/wwmisc.c
+++ b/usr.bin/window/wwmisc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwmisc.c,v 1.3 1996/06/26 05:43:46 deraadt Exp $	*/
+/*	$OpenBSD: wwmisc.c,v 1.4 1997/02/25 00:04:59 downsj 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.3 1996/06/26 05:43:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwmisc.c,v 1.4 1997/02/25 00:04:59 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwmove.c b/usr.bin/window/wwmove.c
index dbf2e04cba7..bcb894366e1 100644
--- a/usr.bin/window/wwmove.c
+++ b/usr.bin/window/wwmove.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwmove.c,v 1.3 1996/06/26 05:43:47 deraadt Exp $	*/
+/*	$OpenBSD: wwmove.c,v 1.4 1997/02/25 00:04:59 downsj 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.3 1996/06/26 05:43:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwmove.c,v 1.4 1997/02/25 00:04:59 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwopen.c b/usr.bin/window/wwopen.c
index 45608516e0d..d128b158572 100644
--- a/usr.bin/window/wwopen.c
+++ b/usr.bin/window/wwopen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwopen.c,v 1.4 1996/06/26 05:43:47 deraadt Exp $	*/
+/*	$OpenBSD: wwopen.c,v 1.5 1997/02/25 00:05:00 downsj Exp $	*/
 /*	$NetBSD: wwopen.c,v 1.6 1996/02/08 21:08:04 mycroft Exp $	*/
 
 /*
@@ -41,10 +41,11 @@
 #if 0
 static char sccsid[] = "@(#)wwopen.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: wwopen.c,v 1.4 1996/06/26 05:43:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwopen.c,v 1.5 1997/02/25 00:05:00 downsj Exp $";
 #endif
 #endif /* not lint */
 
+#include <stdlib.h>
 #include "ww.h"
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/window/wwprintf.c b/usr.bin/window/wwprintf.c
index 21adbb7357a..47b17d3fd71 100644
--- a/usr.bin/window/wwprintf.c
+++ b/usr.bin/window/wwprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwprintf.c,v 1.2 1996/06/26 05:43:48 deraadt Exp $	*/
+/*	$OpenBSD: wwprintf.c,v 1.3 1997/02/25 00:05:01 downsj Exp $	*/
 /*	$NetBSD: wwprintf.c,v 1.3 1995/09/28 10:35:44 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwprintf.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwprintf.c,v 1.2 1996/06/26 05:43:48 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwprintf.c,v 1.3 1997/02/25 00:05:01 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwpty.c b/usr.bin/window/wwpty.c
index aa9e8174aa3..1ea5ea67747 100644
--- a/usr.bin/window/wwpty.c
+++ b/usr.bin/window/wwpty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwpty.c,v 1.2 1996/06/26 05:43:48 deraadt Exp $	*/
+/*	$OpenBSD: wwpty.c,v 1.3 1997/02/25 00:05:02 downsj 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.2 1996/06/26 05:43:48 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwpty.c,v 1.3 1997/02/25 00:05:02 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwputc.c b/usr.bin/window/wwputc.c
index fd75b9654af..9f5d4251a6f 100644
--- a/usr.bin/window/wwputc.c
+++ b/usr.bin/window/wwputc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwputc.c,v 1.2 1996/06/26 05:43:49 deraadt Exp $	*/
+/*	$OpenBSD: wwputc.c,v 1.3 1997/02/25 00:05:03 downsj Exp $	*/
 /*	$NetBSD: wwputc.c,v 1.3 1995/09/28 10:35:47 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwputc.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwputc.c,v 1.2 1996/06/26 05:43:49 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwputc.c,v 1.3 1997/02/25 00:05:03 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwputs.c b/usr.bin/window/wwputs.c
index 572379a078e..53ce75cf1dd 100644
--- a/usr.bin/window/wwputs.c
+++ b/usr.bin/window/wwputs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwputs.c,v 1.2 1996/06/26 05:43:49 deraadt Exp $	*/
+/*	$OpenBSD: wwputs.c,v 1.3 1997/02/25 00:05:04 downsj Exp $	*/
 /*	$NetBSD: wwputs.c,v 1.3 1995/09/28 10:35:48 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwputs.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwputs.c,v 1.2 1996/06/26 05:43:49 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwputs.c,v 1.3 1997/02/25 00:05:04 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwredraw.c b/usr.bin/window/wwredraw.c
index d4e34b5d94a..befef0b30a6 100644
--- a/usr.bin/window/wwredraw.c
+++ b/usr.bin/window/wwredraw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwredraw.c,v 1.2 1996/06/26 05:43:50 deraadt Exp $	*/
+/*	$OpenBSD: wwredraw.c,v 1.3 1997/02/25 00:05:04 downsj 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.2 1996/06/26 05:43:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwredraw.c,v 1.3 1997/02/25 00:05:04 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwredrawwin.c b/usr.bin/window/wwredrawwin.c
index e2dcdbe166f..ca0a210ea8a 100644
--- a/usr.bin/window/wwredrawwin.c
+++ b/usr.bin/window/wwredrawwin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwredrawwin.c,v 1.3 1996/06/26 05:43:50 deraadt Exp $	*/
+/*	$OpenBSD: wwredrawwin.c,v 1.4 1997/02/25 00:05:05 downsj Exp $	*/
 /*	$NetBSD: wwredrawwin.c,v 1.4 1996/02/08 21:49:15 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwredrawwin.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwredrawwin.c,v 1.3 1996/06/26 05:43:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwredrawwin.c,v 1.4 1997/02/25 00:05:05 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwrint.c b/usr.bin/window/wwrint.c
index 9c82395b059..fbaa7bdd36b 100644
--- a/usr.bin/window/wwrint.c
+++ b/usr.bin/window/wwrint.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwrint.c,v 1.3 1996/06/26 05:43:50 deraadt Exp $	*/
+/*	$OpenBSD: wwrint.c,v 1.4 1997/02/25 00:05:06 downsj 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.3 1996/06/26 05:43:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwrint.c,v 1.4 1997/02/25 00:05:06 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwscroll.c b/usr.bin/window/wwscroll.c
index 8b8b732fe65..1146727bc1a 100644
--- a/usr.bin/window/wwscroll.c
+++ b/usr.bin/window/wwscroll.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwscroll.c,v 1.2 1996/06/26 05:43:51 deraadt Exp $	*/
+/*	$OpenBSD: wwscroll.c,v 1.3 1997/02/25 00:05:07 downsj 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.2 1996/06/26 05:43:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwscroll.c,v 1.3 1997/02/25 00:05:07 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwsize.c b/usr.bin/window/wwsize.c
index 3350d9b5da0..8c3781bd6b8 100644
--- a/usr.bin/window/wwsize.c
+++ b/usr.bin/window/wwsize.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwsize.c,v 1.4 1996/06/26 05:43:51 deraadt Exp $	*/
+/*	$OpenBSD: wwsize.c,v 1.5 1997/02/25 00:05:08 downsj 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.4 1996/06/26 05:43:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwsize.c,v 1.5 1997/02/25 00:05:08 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwspawn.c b/usr.bin/window/wwspawn.c
index b64af45d103..6d358a0a168 100644
--- a/usr.bin/window/wwspawn.c
+++ b/usr.bin/window/wwspawn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwspawn.c,v 1.4 1996/12/06 02:28:58 deraadt Exp $	*/
+/*	$OpenBSD: wwspawn.c,v 1.5 1997/02/25 00:05:09 downsj Exp $	*/
 /*	$NetBSD: wwspawn.c,v 1.4 1995/12/21 08:39:57 mycroft Exp $	*/
 
 /*
@@ -41,13 +41,12 @@
 #if 0
 static char sccsid[] = "@(#)wwspawn.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.4 1996/12/06 02:28:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.5 1997/02/25 00:05:09 downsj Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 #include <sys/signal.h>
-#include <stdio.h>
 
 /*
  * There is a dead lock with vfork and closing of pseudo-ports.
@@ -78,7 +77,6 @@ char **argv;
 		erred = 1;
 		_exit(1);
 	default:
-		(void) wait(NULL);
 		if (erred) {
 			wwerrno = WWE_SYS;
 			ret = -1;
diff --git a/usr.bin/window/wwsuspend.c b/usr.bin/window/wwsuspend.c
index 9346edea83e..409ce6cce0a 100644
--- a/usr.bin/window/wwsuspend.c
+++ b/usr.bin/window/wwsuspend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwsuspend.c,v 1.2 1996/06/26 05:43:52 deraadt Exp $	*/
+/*	$OpenBSD: wwsuspend.c,v 1.3 1997/02/25 00:05:09 downsj Exp $	*/
 /*	$NetBSD: wwsuspend.c,v 1.3 1995/09/28 10:35:56 tls Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwsuspend.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwsuspend.c,v 1.2 1996/06/26 05:43:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwsuspend.c,v 1.3 1997/02/25 00:05:09 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwterminfo.c b/usr.bin/window/wwterminfo.c
index 295cd288e3f..c6b3e397e14 100644
--- a/usr.bin/window/wwterminfo.c
+++ b/usr.bin/window/wwterminfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwterminfo.c,v 1.3 1996/12/06 02:29:00 deraadt Exp $	*/
+/*	$OpenBSD: wwterminfo.c,v 1.4 1997/02/25 00:05:10 downsj Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -37,7 +37,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)wwterminfo.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$OpenBSD: wwterminfo.c,v 1.4 1997/02/25 00:05:10 downsj Exp $";
+#endif
 #endif /* not lint */
 
 #ifdef TERMINFO
@@ -100,9 +104,8 @@ wwterminfoend()
 		return -1;
 	case 0:
 		execl(_PATH_RM, _PATH_RM, "-rf", wwterminfopath, 0);
-		_exit(1);
+		return -1;
 	default:
-		(void)wait(NULL);
 		return 0;
 	}
 }
diff --git a/usr.bin/window/wwtty.c b/usr.bin/window/wwtty.c
index c207edecc9a..a84548dc1ef 100644
--- a/usr.bin/window/wwtty.c
+++ b/usr.bin/window/wwtty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwtty.c,v 1.3 1996/06/26 05:43:53 deraadt Exp $	*/
+/*	$OpenBSD: wwtty.c,v 1.4 1997/02/25 00:05:11 downsj 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.3 1996/06/26 05:43:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwtty.c,v 1.4 1997/02/25 00:05:11 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwunframe.c b/usr.bin/window/wwunframe.c
index 244163e3c0c..3c565430504 100644
--- a/usr.bin/window/wwunframe.c
+++ b/usr.bin/window/wwunframe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwunframe.c,v 1.3 1996/06/26 05:43:54 deraadt Exp $	*/
+/*	$OpenBSD: wwunframe.c,v 1.4 1997/02/25 00:05:12 downsj Exp $	*/
 /*	$NetBSD: wwunframe.c,v 1.4 1996/02/08 21:49:17 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)wwunframe.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwunframe.c,v 1.3 1996/06/26 05:43:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwunframe.c,v 1.4 1997/02/25 00:05:12 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwupdate.c b/usr.bin/window/wwupdate.c
index 28e92c0f1ef..bd8f6438597 100644
--- a/usr.bin/window/wwupdate.c
+++ b/usr.bin/window/wwupdate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwupdate.c,v 1.2 1996/06/26 05:43:54 deraadt Exp $	*/
+/*	$OpenBSD: wwupdate.c,v 1.3 1997/02/25 00:05:13 downsj 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.2 1996/06/26 05:43:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwupdate.c,v 1.3 1997/02/25 00:05:13 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/wwwrite.c b/usr.bin/window/wwwrite.c
index 8a06db562cc..7d05ea229b7 100644
--- a/usr.bin/window/wwwrite.c
+++ b/usr.bin/window/wwwrite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwwrite.c,v 1.3 1996/06/26 05:43:55 deraadt Exp $	*/
+/*	$OpenBSD: wwwrite.c,v 1.4 1997/02/25 00:05:14 downsj 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.3 1996/06/26 05:43:55 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwwrite.c,v 1.4 1997/02/25 00:05:14 downsj Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/window/xx.c b/usr.bin/window/xx.c
index 138caf26f0a..5c6634b9727 100644
--- a/usr.bin/window/xx.c
+++ b/usr.bin/window/xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xx.c,v 1.2 1996/06/26 05:43:55 deraadt Exp $	*/
+/*	$OpenBSD: xx.c,v 1.3 1997/02/25 00:05:15 downsj Exp $	*/
 /*	$NetBSD: xx.c,v 1.3 1995/09/28 10:36:03 tls Exp $	*/
 
 /*
@@ -41,10 +41,11 @@
 #if 0
 static char sccsid[] = "@(#)xx.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: xx.c,v 1.2 1996/06/26 05:43:55 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: xx.c,v 1.3 1997/02/25 00:05:15 downsj Exp $";
 #endif
 #endif /* not lint */
 
+#include <stdlib.h>
 #include "ww.h"
 #include "xx.h"
 #include "tt.h"
diff --git a/usr.bin/window/xx.h b/usr.bin/window/xx.h
index f9655f9f692..b7a63cce47f 100644
--- a/usr.bin/window/xx.h
+++ b/usr.bin/window/xx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xx.h,v 1.2 1996/06/26 05:43:56 deraadt Exp $	*/
+/*	$OpenBSD: xx.h,v 1.3 1997/02/25 00:05:16 downsj Exp $	*/
 /*	$NetBSD: xx.h,v 1.3 1995/09/28 10:36:04 tls Exp $	*/
 
 /*
diff --git a/usr.bin/window/xxflush.c b/usr.bin/window/xxflush.c
index e6f67ff2149..d73123d33a3 100644
--- a/usr.bin/window/xxflush.c
+++ b/usr.bin/window/xxflush.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xxflush.c,v 1.2 1996/06/26 05:43:56 deraadt Exp $	*/
+/*	$OpenBSD: xxflush.c,v 1.3 1997/02/25 00:05:17 downsj 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.2 1996/06/26 05:43:56 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: xxflush.c,v 1.3 1997/02/25 00:05:17 downsj Exp $";
 #endif
 #endif /* not lint */
 
-- 
2.20.1