diff options
| author | phk <phk@FreeBSD.org> | 2004-06-21 22:57:16 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-06-21 22:57:16 +0000 |
| commit | 0033eabc1bfccaa5b6791400e4ba6ff9c191c034 (patch) | |
| tree | f2e674a8767cfdecab4ee0f2ac7afc0fb32c978f /sys/kern | |
| parent | a5b5031c524a9ecf5ee118337e7392768ee986c3 (diff) | |
| download | FreeBSD-src-0033eabc1bfccaa5b6791400e4ba6ff9c191c034.zip FreeBSD-src-0033eabc1bfccaa5b6791400e4ba6ff9c191c034.tar.gz | |
Put the pre FreeBSD-2.x tty compat code under BURN_BRIDGES.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/tty.c | 8 | ||||
| -rw-r--r-- | sys/kern/tty_compat.c | 3 | ||||
| -rw-r--r-- | sys/kern/tty_pty.c | 8 |
3 files changed, 17 insertions, 2 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 6c5f4d5..bb35a78 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -83,9 +83,11 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/namei.h> #include <sys/sx.h> +#ifndef BURN_BRIDGES #if defined(COMPAT_43) #include <sys/ioctl_compat.h> #endif +#endif #include <sys/proc.h> #define TTYDEFCHARS #include <sys/tty.h> @@ -769,6 +771,7 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag) case TIOCSTI: case TIOCSTOP: case TIOCSWINSZ: +#ifndef BURN_BRIDGES #if defined(COMPAT_43) case TIOCLBIC: case TIOCLBIS: @@ -779,6 +782,7 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag) case TIOCSETP: case TIOCSLTC: #endif +#endif sx_slock(&proctree_lock); PROC_LOCK(p); while (isbackground(p, tp) && !(p->p_flag & P_PPWAIT) && @@ -1131,10 +1135,14 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag) break; default: #if defined(COMPAT_43) +#ifndef BURN_BRIDGES return (ttcompat(tp, cmd, data, flag)); #else return (ENOIOCTL); #endif +#else + return (ENOIOCTL); +#endif } return (0); } diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c index a7e83fb..f8975b6 100644 --- a/sys/kern/tty_compat.c +++ b/sys/kern/tty_compat.c @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" +#ifndef BURN_BRIDGES /* * mapping routines for old line discipline (yuck) */ @@ -471,3 +472,5 @@ ttcompatsetlflags(struct tty *tp, struct termios *t) t->c_cflag = cflag; } #endif /* COMPAT_43 */ + +#endif /* BURN_BRIDGES */ diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 1e5d202..1cdea93 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -43,9 +43,11 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> #include <sys/sx.h> +#ifndef BURN_BRIDGES #if defined(COMPAT_43) #include <sys/ioctl_compat.h> #endif +#endif #include <sys/proc.h> #include <sys/tty.h> #include <sys/conf.h> @@ -659,10 +661,12 @@ ptyioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td return (EAGAIN); switch (cmd) { +#ifndef BURN_BRIDGES #ifdef COMPAT_43 case TIOCSETP: case TIOCSETN: #endif +#endif case TIOCSETD: case TIOCSETA: case TIOCSETAW: @@ -734,17 +738,17 @@ ptyioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td case TIOCSETA: case TIOCSETAW: case TIOCSETAF: +#ifndef BURN_BRIDGES #ifdef COMPAT_43 case TIOCSETP: case TIOCSETN: -#endif -#if defined(COMPAT_43) case TIOCSETC: case TIOCSLTC: case TIOCLBIS: case TIOCLBIC: case TIOCLSET: #endif +#endif pt->pt_send |= TIOCPKT_IOCTL; ptcwakeup(tp, FREAD); break; |
