summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>1997-11-05 09:38:54 +0000
committerderaadt <deraadt@openbsd.org>1997-11-05 09:38:54 +0000
commit7c696073f011d64a5c2f07f738d3058429c54888 (patch)
treec091bd41de57adbc7a7a4fe90e43ff67556c49d5
parenthandle c++ and other languages; buffer underrun; netbsd pr#4392; (diff)
downloadwireguard-openbsd-7c696073f011d64a5c2f07f738d3058429c54888.tar.xz
wireguard-openbsd-7c696073f011d64a5c2f07f738d3058429c54888.zip
flush tty queue when entering/exiting X; cgd & me
-rw-r--r--sys/arch/i386/isa/pccons.c4
-rw-r--r--sys/arch/i386/isa/pcvt/pcvt_drv.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index cc9211566b5..4e0cef05088 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccons.c,v 1.34 1997/03/03 12:01:15 downsj Exp $ */
+/* $OpenBSD: pccons.c,v 1.35 1997/11/05 09:38:54 deraadt Exp $ */
/* $NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $ */
/*-
@@ -673,9 +673,11 @@ pcioctl(dev, cmd, data, flag, p)
#ifdef XSERVER
case CONSOLE_X_MODE_ON:
pc_xmode_on();
+ ttyflush(tp, FREAD);
return 0;
case CONSOLE_X_MODE_OFF:
pc_xmode_off();
+ ttyflush(tp, FREAD);
return 0;
case CONSOLE_X_BELL:
/*
diff --git a/sys/arch/i386/isa/pcvt/pcvt_drv.c b/sys/arch/i386/isa/pcvt/pcvt_drv.c
index dc333ef6ab0..6268bac57e3 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcvt_drv.c,v 1.16 1997/09/18 16:22:44 deraadt Exp $ */
+/* $OpenBSD: pcvt_drv.c,v 1.17 1997/11/05 09:38:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -683,6 +683,7 @@ pcioctl(Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
i = K_RAW;
error = usl_vt_ioctl(dev, KDSKBMODE, (caddr_t)&i, flag, p);
+ ttyflush(tp, FREAD);
return error;
}
@@ -697,6 +698,7 @@ pcioctl(Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
i = K_XLATE;
(void)usl_vt_ioctl(dev, KDSKBMODE, (caddr_t)&i, flag, p);
+ ttyflush(tp, FREAD);
return 0;
}