projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move copyin() call so if uap->size pointer is null, still return size
[unix-history]
/
usr
/
src
/
sys
/
kern
/
tty_compat.c
diff --git
a/usr/src/sys/kern/tty_compat.c
b/usr/src/sys/kern/tty_compat.c
index
8ab264e
..
0b62225
100644
(file)
--- a/
usr/src/sys/kern/tty_compat.c
+++ b/
usr/src/sys/kern/tty_compat.c
@@
-1,9
+1,10
@@
-/*
- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved. The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1982, 1986, 1991 The Regents of the University of California.
+ * All rights reserved.
*
*
- * @(#)tty_compat.c 7.1 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ * @(#)tty_compat.c 7.10 (Berkeley) %G%
*/
/*
*/
/*
@@
-13,7
+14,6
@@
#include "param.h"
#include "systm.h"
#include "param.h"
#include "systm.h"
-#include "user.h"
#include "ioctl.h"
#include "tty.h"
#include "termios.h"
#include "ioctl.h"
#include "tty.h"
#include "termios.h"
@@
-21,15
+21,11
@@
#include "file.h"
#include "conf.h"
#include "dkstat.h"
#include "file.h"
#include "conf.h"
#include "dkstat.h"
-#include "uio.h"
#include "kernel.h"
#include "syslog.h"
#include "kernel.h"
#include "syslog.h"
-#include "machine/reg.h"
-
int ttydebug = 0;
int ttydebug = 0;
-/* XXX - fold these two tables into one */
static struct speedtab compatspeeds[] = {
38400, 15,
19200, 14,
static struct speedtab compatspeeds[] = {
38400, 15,
19200, 14,
@@
-59,7
+55,8
@@
ttcompat(tp, com, data, flag)
register struct tty *tp;
caddr_t data;
{
register struct tty *tp;
caddr_t data;
{
- switch(com) {
+
+ switch (com) {
case TIOCGETP: {
register struct sgttyb *sg = (struct sgttyb *)data;
register u_char *cc = tp->t_cc;
case TIOCGETP: {
register struct sgttyb *sg = (struct sgttyb *)data;
register u_char *cc = tp->t_cc;
@@
-96,9
+93,7
@@
ttcompat(tp, com, data, flag)
term.c_ospeed = compatspcodes[speed];
term.c_cc[VERASE] = sg->sg_erase;
term.c_cc[VKILL] = sg->sg_kill;
term.c_ospeed = compatspcodes[speed];
term.c_cc[VERASE] = sg->sg_erase;
term.c_cc[VKILL] = sg->sg_kill;
- if (sg->sg_erase == -1)
- term.c_cc[VERASE2] = _POSIX_VDISABLE;
- tp->t_flags = (tp->t_flags&0xffff0000) | sg->sg_flags;
+ tp->t_flags = tp->t_flags&0xffff0000 | sg->sg_flags&0xffff;
ttcompatsetflags(tp, &term);
return (ttioctl(tp, com == TIOCSETP ? TIOCSETAF : TIOCSETA,
&term, flag));
ttcompatsetflags(tp, &term);
return (ttioctl(tp, com == TIOCSETP ? TIOCSETAF : TIOCSETA,
&term, flag));
@@
-137,7
+132,7
@@
ttcompat(tp, com, data, flag)
cc[VSUSP] = ltc->t_suspc;
cc[VDSUSP] = ltc->t_dsuspc;
cc[VREPRINT] = ltc->t_rprntc;
cc[VSUSP] = ltc->t_suspc;
cc[VDSUSP] = ltc->t_dsuspc;
cc[VREPRINT] = ltc->t_rprntc;
- cc[V
FLUSHO
] = ltc->t_flushc;
+ cc[V
DISCARD
] = ltc->t_flushc;
cc[VWERASE] = ltc->t_werasc;
cc[VLNEXT] = ltc->t_lnextc;
break;
cc[VWERASE] = ltc->t_werasc;
cc[VLNEXT] = ltc->t_lnextc;
break;
@@
-149,7
+144,7
@@
ttcompat(tp, com, data, flag)
ltc->t_suspc = cc[VSUSP];
ltc->t_dsuspc = cc[VDSUSP];
ltc->t_rprntc = cc[VREPRINT];
ltc->t_suspc = cc[VSUSP];
ltc->t_dsuspc = cc[VDSUSP];
ltc->t_rprntc = cc[VREPRINT];
- ltc->t_flushc = cc[V
FLUSHO
];
+ ltc->t_flushc = cc[V
DISCARD
];
ltc->t_werasc = cc[VWERASE];
ltc->t_lnextc = cc[VLNEXT];
break;
ltc->t_werasc = cc[VWERASE];
ltc->t_lnextc = cc[VLNEXT];
break;
@@
-179,21
+174,25
@@
ttcompat(tp, com, data, flag)
printf("CLGET: returning %x\n", *(int *)data);
break;
printf("CLGET: returning %x\n", *(int *)data);
break;
- case
TIOCGETDCOMPAT
:
+ case
OTIOCGETD
:
*(int *)data = tp->t_line ? tp->t_line : 2;
break;
*(int *)data = tp->t_line ? tp->t_line : 2;
break;
- case
TIOCSETDCOMPAT
: {
+ case
OTIOCSETD
: {
int ldisczero = 0;
int ldisczero = 0;
- return(ttioctl(tp, TIOCSETD,
+ return
(ttioctl(tp, TIOCSETD,
*(int *)data == 2 ? (caddr_t)&ldisczero : data, flag));
*(int *)data == 2 ? (caddr_t)&ldisczero : data, flag));
- }
+ }
+
+ case OTIOCCONS:
+ *(int *)data = 1;
+ return (ttioctl(tp, TIOCCONS, data, flag));
default:
return (-1);
}
default:
return (-1);
}
- return(0);
+ return
(0);
}
ttcompatgetflags(tp)
}
ttcompatgetflags(tp)
@@
-266,7
+265,7
@@
ttcompatsetflags(tp, t)
} else {
iflag |= BRKINT|IXON|IMAXBEL;
oflag |= OPOST;
} else {
iflag |= BRKINT|IXON|IMAXBEL;
oflag |= OPOST;
- lflag |= ISIG|IEXTEN
;
+ lflag |= ISIG|IEXTEN
|ECHOCTL; /* XXX was echoctl on ? */
if (flags & XTABS)
oflag |= OXTABS;
else
if (flags & XTABS)
oflag |= OXTABS;
else
@@
-293,9
+292,12
@@
ttcompatsetflags(tp, t)
cflag |= CS8;
if ((flags&(RAW|PASS8)) == 0)
iflag |= ISTRIP;
cflag |= CS8;
if ((flags&(RAW|PASS8)) == 0)
iflag |= ISTRIP;
+ else
+ iflag &= ~ISTRIP;
} else {
cflag &= ~CSIZE;
cflag |= CS7|PARENB;
} else {
cflag &= ~CSIZE;
cflag |= CS7|PARENB;
+ iflag |= ISTRIP;
}
if ((flags&(EVENP|ODDP)) == EVENP) {
iflag |= INPCK;
}
if ((flags&(EVENP|ODDP)) == EVENP) {
iflag |= INPCK;