summaryrefslogtreecommitdiff
path: root/usr.bin/window/win.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-26 18:00:42 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-26 18:00:42 +0000
commitb5ac7add8214b5b1d3a3557e63ece819dd1e7c56 (patch)
tree4f840a357fe1ddb27d0a850af958636843ab0179 /usr.bin/window/win.c
parentbc349e2e6d187585cab3ce4d8d434fc87cced2a0 (diff)
from netbsd:
Use POSIX signals. Always set FNONBLOCK on the tty. Eliminate the use of SIGIO, and some other cleanup. We don't need non-blocking mode without SIGIO.
Diffstat (limited to 'usr.bin/window/win.c')
-rw-r--r--usr.bin/window/win.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/window/win.c b/usr.bin/window/win.c
index da31a4c186f..e7fe8db9701 100644
--- a/usr.bin/window/win.c
+++ b/usr.bin/window/win.c
@@ -1,4 +1,4 @@
-/* $NetBSD: win.c,v 1.5 1995/09/29 00:44:08 cgd Exp $ */
+/* $NetBSD: win.c,v 1.6 1995/12/21 10:46:01 mycroft Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)win.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: win.c,v 1.5 1995/09/29 00:44:08 cgd Exp $";
+static char rcsid[] = "$NetBSD: win.c,v 1.6 1995/12/21 10:46:01 mycroft Exp $";
#endif
#endif /* not lint */
@@ -82,7 +82,7 @@ char *shf, **sh;
error("Illegal window position.");
return 0;
}
- w = wwopen(haspty ? WWO_PTY : WWO_SOCKET, nrow, ncol, row, col, nline);
+ w = wwopen(haspty ? WWT_PTY : WWT_SOCKET, 0, nrow, ncol, row, col, nline);
if (w == 0) {
error("Can't open window: %s.", wwerror());
return 0;
@@ -179,7 +179,7 @@ char *label;
{
register struct ww *w;
- if ((w = wwopen(0, nrow, wwncol, 2, 0, 0)) == 0)
+ if ((w = wwopen(WWT_INTERNAL, 0, nrow, wwncol, 2, 0, 0)) == 0)
return 0;
w->ww_mapnl = 1;
w->ww_hasframe = 1;
@@ -308,7 +308,7 @@ register struct ww *w;
stopwin(w)
register struct ww *w;
{
- if (w->ww_pty >= 0 && w->ww_ispty && wwstoptty(w->ww_pty) < 0)
+ if (w->ww_pty >= 0 && w->ww_type == WWT_PTY && wwstoptty(w->ww_pty) < 0)
error("Can't stop output: %s.", wwerror());
else
w->ww_stopped = 1;
@@ -317,7 +317,7 @@ stopwin(w)
startwin(w)
register struct ww *w;
{
- if (w->ww_pty >= 0 && w->ww_ispty && wwstarttty(w->ww_pty) < 0)
+ if (w->ww_pty >= 0 && w->ww_type == WWT_PTY && wwstarttty(w->ww_pty) < 0)
error("Can't start output: %s.", wwerror());
else
w->ww_stopped = 0;