diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ttymodes.c | 14 | ||||
-rw-r--r-- | ttymodes.h | 111 |
3 files changed, 60 insertions, 70 deletions
@@ -6,6 +6,9 @@ | |||
6 | - deraadt@cvs.openbsd.org 2001/03/10 12:53:51 | 6 | - deraadt@cvs.openbsd.org 2001/03/10 12:53:51 |
7 | [readconf.c ssh_config] | 7 | [readconf.c ssh_config] |
8 | default to SSH2, now that m68k runs fast | 8 | default to SSH2, now that m68k runs fast |
9 | - stevesk@cvs.openbsd.org 2001/03/10 15:02:05 | ||
10 | [ttymodes.c ttymodes.h] | ||
11 | remove unused sgtty macros; ok markus@ | ||
9 | 12 | ||
10 | 20010310 | 13 | 20010310 |
11 | - OpenBSD CVS Sync | 14 | - OpenBSD CVS Sync |
@@ -4477,4 +4480,4 @@ | |||
4477 | - Wrote replacements for strlcpy and mkdtemp | 4480 | - Wrote replacements for strlcpy and mkdtemp |
4478 | - Released 1.0pre1 | 4481 | - Released 1.0pre1 |
4479 | 4482 | ||
4480 | $Id: ChangeLog,v 1.935 2001/03/10 17:15:39 mouring Exp $ | 4483 | $Id: ChangeLog,v 1.936 2001/03/10 17:17:28 mouring Exp $ |
diff --git a/ttymodes.c b/ttymodes.c index 2516e9310..65caf2ff8 100644 --- a/ttymodes.c +++ b/ttymodes.c | |||
@@ -15,7 +15,7 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$OpenBSD: ttymodes.c,v 1.10 2001/01/21 19:06:01 markus Exp $"); | 18 | RCSID("$OpenBSD: ttymodes.c,v 1.11 2001/03/10 15:02:05 stevesk Exp $"); |
19 | 19 | ||
20 | #include "packet.h" | 20 | #include "packet.h" |
21 | #include "log.h" | 21 | #include "log.h" |
@@ -233,17 +233,11 @@ tty_make_modes(int fd) | |||
233 | packet_put_char(OP); packet_put_char(tio.c_cc[NAME]); | 233 | packet_put_char(OP); packet_put_char(tio.c_cc[NAME]); |
234 | #define TTYMODE(NAME, FIELD, OP) \ | 234 | #define TTYMODE(NAME, FIELD, OP) \ |
235 | packet_put_char(OP); packet_put_char((tio.FIELD & NAME) != 0); | 235 | packet_put_char(OP); packet_put_char((tio.FIELD & NAME) != 0); |
236 | #define SGTTYCHAR(NAME, OP) | ||
237 | #define SGTTYMODE(NAME, FIELD, OP) | ||
238 | #define SGTTYMODEN(NAME, FIELD, OP) | ||
239 | 236 | ||
240 | #include "ttymodes.h" | 237 | #include "ttymodes.h" |
241 | 238 | ||
242 | #undef TTYCHAR | 239 | #undef TTYCHAR |
243 | #undef TTYMODE | 240 | #undef TTYMODE |
244 | #undef SGTTYCHAR | ||
245 | #undef SGTTYMODE | ||
246 | #undef SGTTYMODEN | ||
247 | 241 | ||
248 | /* Mark end of mode data. */ | 242 | /* Mark end of mode data. */ |
249 | packet_put_char(TTY_OP_END); | 243 | packet_put_char(TTY_OP_END); |
@@ -303,17 +297,11 @@ tty_parse_modes(int fd, int *n_bytes_ptr) | |||
303 | else \ | 297 | else \ |
304 | tio.FIELD &= ~NAME; \ | 298 | tio.FIELD &= ~NAME; \ |
305 | break; | 299 | break; |
306 | #define SGTTYCHAR(NAME, OP) | ||
307 | #define SGTTYMODE(NAME, FIELD, OP) | ||
308 | #define SGTTYMODEN(NAME, FIELD, OP) | ||
309 | 300 | ||
310 | #include "ttymodes.h" | 301 | #include "ttymodes.h" |
311 | 302 | ||
312 | #undef TTYCHAR | 303 | #undef TTYCHAR |
313 | #undef TTYMODE | 304 | #undef TTYMODE |
314 | #undef SGTTYCHAR | ||
315 | #undef SGTTYMODE | ||
316 | #undef SGTTYMODEN | ||
317 | 305 | ||
318 | default: | 306 | default: |
319 | debug("Ignoring unsupported tty mode opcode %d (0x%x)", | 307 | debug("Ignoring unsupported tty mode opcode %d (0x%x)", |
diff --git a/ttymodes.h b/ttymodes.h index a26e4fa5b..860fd0a9c 100644 --- a/ttymodes.h +++ b/ttymodes.h | |||
@@ -11,7 +11,7 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: ttymodes.h,v 1.9 2000/09/07 20:27:55 deraadt Exp $"); */ | 14 | /* RCSID("$OpenBSD: ttymodes.h,v 1.10 2001/03/10 15:02:05 stevesk Exp $"); */ |
15 | 15 | ||
16 | /* The tty mode description is a stream of bytes. The stream consists of | 16 | /* The tty mode description is a stream of bytes. The stream consists of |
17 | * opcode-arguments pairs. It is terminated by opcode TTY_OP_END (0). | 17 | * opcode-arguments pairs. It is terminated by opcode TTY_OP_END (0). |
@@ -31,110 +31,109 @@ | |||
31 | * is only intended for including from ttymodes.c. | 31 | * is only intended for including from ttymodes.c. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | /* termios macro */ /* sgtty macro */ | 34 | /* termios macro */ |
35 | /* name, op */ | 35 | /* name, op */ |
36 | TTYCHAR(VINTR, 1) SGTTYCHAR(tiotc.t_intrc, 1) | 36 | TTYCHAR(VINTR, 1) |
37 | TTYCHAR(VQUIT, 2) SGTTYCHAR(tiotc.t_quitc, 2) | 37 | TTYCHAR(VQUIT, 2) |
38 | TTYCHAR(VERASE, 3) SGTTYCHAR(tio.sg_erase, 3) | 38 | TTYCHAR(VERASE, 3) |
39 | #if defined(VKILL) | 39 | #if defined(VKILL) |
40 | TTYCHAR(VKILL, 4) SGTTYCHAR(tio.sg_kill, 4) | 40 | TTYCHAR(VKILL, 4) |
41 | #endif /* VKILL */ | 41 | #endif /* VKILL */ |
42 | TTYCHAR(VEOF, 5) SGTTYCHAR(tiotc.t_eofc, 5) | 42 | TTYCHAR(VEOF, 5) |
43 | #if defined(VEOL) | 43 | #if defined(VEOL) |
44 | TTYCHAR(VEOL, 6) SGTTYCHAR(tiotc.t_brkc, 6) | 44 | TTYCHAR(VEOL, 6) |
45 | #endif /* VEOL */ | 45 | #endif /* VEOL */ |
46 | #ifdef VEOL2 /* n/a */ | 46 | #ifdef VEOL2 |
47 | TTYCHAR(VEOL2, 7) | 47 | TTYCHAR(VEOL2, 7) |
48 | #endif /* VEOL2 */ | 48 | #endif /* VEOL2 */ |
49 | TTYCHAR(VSTART, 8) SGTTYCHAR(tiotc.t_startc, 8) | 49 | TTYCHAR(VSTART, 8) |
50 | TTYCHAR(VSTOP, 9) SGTTYCHAR(tiotc.t_stopc, 9) | 50 | TTYCHAR(VSTOP, 9) |
51 | #if defined(VSUSP) | 51 | #if defined(VSUSP) |
52 | TTYCHAR(VSUSP, 10) SGTTYCHAR(tioltc.t_suspc, 10) | 52 | TTYCHAR(VSUSP, 10) |
53 | #endif /* VSUSP */ | 53 | #endif /* VSUSP */ |
54 | #if defined(VDSUSP) | 54 | #if defined(VDSUSP) |
55 | TTYCHAR(VDSUSP, 11) SGTTYCHAR(tioltc.t_dsuspc, 11) | 55 | TTYCHAR(VDSUSP, 11) |
56 | #endif /* VDSUSP */ | 56 | #endif /* VDSUSP */ |
57 | #if defined(VREPRINT) | 57 | #if defined(VREPRINT) |
58 | TTYCHAR(VREPRINT, 12) SGTTYCHAR(tioltc.t_rprntc, 12) | 58 | TTYCHAR(VREPRINT, 12) |
59 | #endif /* VREPRINT */ | 59 | #endif /* VREPRINT */ |
60 | #if defined(VWERASE) | 60 | #if defined(VWERASE) |
61 | TTYCHAR(VWERASE, 13) SGTTYCHAR(tioltc.t_werasc, 13) | 61 | TTYCHAR(VWERASE, 13) |
62 | #endif /* VWERASE */ | 62 | #endif /* VWERASE */ |
63 | #if defined(VLNEXT) | 63 | #if defined(VLNEXT) |
64 | TTYCHAR(VLNEXT, 14) SGTTYCHAR(tioltc.t_lnextc, 14) | 64 | TTYCHAR(VLNEXT, 14) |
65 | #endif /* VLNEXT */ | 65 | #endif /* VLNEXT */ |
66 | #if defined(VFLUSH) | 66 | #if defined(VFLUSH) |
67 | TTYCHAR(VFLUSH, 15) SGTTYCHAR(tioltc.t_flushc, 15) | 67 | TTYCHAR(VFLUSH, 15) |
68 | #endif /* VFLUSH */ | 68 | #endif /* VFLUSH */ |
69 | #ifdef VSWTCH | 69 | #ifdef VSWTCH |
70 | TTYCHAR(VSWTCH, 16) /* n/a */ | 70 | TTYCHAR(VSWTCH, 16) |
71 | #endif /* VSWTCH */ | 71 | #endif /* VSWTCH */ |
72 | #if defined(VSTATUS) | 72 | #if defined(VSTATUS) |
73 | TTYCHAR(VSTATUS, 17) SGTTYCHAR(tiots.tc_statusc, 17) | 73 | TTYCHAR(VSTATUS, 17) |
74 | #endif /* VSTATUS */ | 74 | #endif /* VSTATUS */ |
75 | #ifdef VDISCARD | 75 | #ifdef VDISCARD |
76 | TTYCHAR(VDISCARD, 18) /* n/a */ | 76 | TTYCHAR(VDISCARD, 18) |
77 | #endif /* VDISCARD */ | 77 | #endif /* VDISCARD */ |
78 | 78 | ||
79 | /* name, field, op */ | 79 | /* name, field, op */ |
80 | TTYMODE(IGNPAR, c_iflag, 30) /* n/a */ | 80 | TTYMODE(IGNPAR, c_iflag, 30) |
81 | TTYMODE(PARMRK, c_iflag, 31) /* n/a */ | 81 | TTYMODE(PARMRK, c_iflag, 31) |
82 | TTYMODE(INPCK, c_iflag, 32) SGTTYMODEN(ANYP, tio.sg_flags, 32) | 82 | TTYMODE(INPCK, c_iflag, 32) |
83 | TTYMODE(ISTRIP, c_iflag, 33) SGTTYMODEN(LPASS8, tiolm, 33) | 83 | TTYMODE(ISTRIP, c_iflag, 33) |
84 | TTYMODE(INLCR, c_iflag, 34) /* n/a */ | 84 | TTYMODE(INLCR, c_iflag, 34) |
85 | TTYMODE(IGNCR, c_iflag, 35) /* n/a */ | 85 | TTYMODE(IGNCR, c_iflag, 35) |
86 | TTYMODE(ICRNL, c_iflag, 36) SGTTYMODE(CRMOD, tio.sg_flags, 36) | 86 | TTYMODE(ICRNL, c_iflag, 36) |
87 | #if defined(IUCLC) | 87 | #if defined(IUCLC) |
88 | TTYMODE(IUCLC, c_iflag, 37) SGTTYMODE(LCASE, tio.sg_flags, 37) | 88 | TTYMODE(IUCLC, c_iflag, 37) |
89 | #endif | 89 | #endif |
90 | TTYMODE(IXON, c_iflag, 38) /* n/a */ | 90 | TTYMODE(IXON, c_iflag, 38) |
91 | TTYMODE(IXANY, c_iflag, 39) SGTTYMODEN(LDECCTQ, tiolm, 39) | 91 | TTYMODE(IXANY, c_iflag, 39) |
92 | TTYMODE(IXOFF, c_iflag, 40) SGTTYMODE(TANDEM, tio.sg_flags, 40) | 92 | TTYMODE(IXOFF, c_iflag, 40) |
93 | #ifdef IMAXBEL | 93 | #ifdef IMAXBEL |
94 | TTYMODE(IMAXBEL,c_iflag, 41) /* n/a */ | 94 | TTYMODE(IMAXBEL,c_iflag, 41) |
95 | #endif /* IMAXBEL */ | 95 | #endif /* IMAXBEL */ |
96 | 96 | ||
97 | TTYMODE(ISIG, c_lflag, 50) /* n/a */ | 97 | TTYMODE(ISIG, c_lflag, 50) |
98 | TTYMODE(ICANON, c_lflag, 51) SGTTYMODEN(CBREAK, tio.sg_flags, 51) | 98 | TTYMODE(ICANON, c_lflag, 51) |
99 | #ifdef XCASE | 99 | #ifdef XCASE |
100 | TTYMODE(XCASE, c_lflag, 52) /* n/a */ | 100 | TTYMODE(XCASE, c_lflag, 52) |
101 | #endif | 101 | #endif |
102 | TTYMODE(ECHO, c_lflag, 53) SGTTYMODE(ECHO, tio.sg_flags, 53) | 102 | TTYMODE(ECHO, c_lflag, 53) |
103 | TTYMODE(ECHOE, c_lflag, 54) SGTTYMODE(LCRTERA, tiolm, 54) | 103 | TTYMODE(ECHOE, c_lflag, 54) |
104 | TTYMODE(ECHOK, c_lflag, 55) SGTTYMODE(LCRTKIL, tiolm, 55) | 104 | TTYMODE(ECHOK, c_lflag, 55) |
105 | TTYMODE(ECHONL, c_lflag, 56) /* n/a */ | 105 | TTYMODE(ECHONL, c_lflag, 56) |
106 | TTYMODE(NOFLSH, c_lflag, 57) SGTTYMODE(LNOFLSH, tiolm, 57) | 106 | TTYMODE(NOFLSH, c_lflag, 57) |
107 | TTYMODE(TOSTOP, c_lflag, 58) SGTTYMODE(LTOSTOP, tiolm, 58) | 107 | TTYMODE(TOSTOP, c_lflag, 58) |
108 | #ifdef IEXTEN | 108 | #ifdef IEXTEN |
109 | TTYMODE(IEXTEN, c_lflag, 59) /* n/a */ | 109 | TTYMODE(IEXTEN, c_lflag, 59) |
110 | #endif /* IEXTEN */ | 110 | #endif /* IEXTEN */ |
111 | #if defined(ECHOCTL) | 111 | #if defined(ECHOCTL) |
112 | TTYMODE(ECHOCTL,c_lflag, 60) SGTTYMODE(LCTLECH, tiolm, 60) | 112 | TTYMODE(ECHOCTL,c_lflag, 60) |
113 | #endif /* ECHOCTL */ | 113 | #endif /* ECHOCTL */ |
114 | #ifdef ECHOKE | 114 | #ifdef ECHOKE |
115 | TTYMODE(ECHOKE, c_lflag, 61) /* n/a */ | 115 | TTYMODE(ECHOKE, c_lflag, 61) |
116 | #endif /* ECHOKE */ | 116 | #endif /* ECHOKE */ |
117 | #if defined(PENDIN) | 117 | #if defined(PENDIN) |
118 | TTYMODE(PENDIN, c_lflag, 62) SGTTYMODE(LPENDIN, tiolm, 62) | 118 | TTYMODE(PENDIN, c_lflag, 62) |
119 | #endif /* PENDIN */ | 119 | #endif /* PENDIN */ |
120 | 120 | ||
121 | TTYMODE(OPOST, c_oflag, 70) /* n/a */ | 121 | TTYMODE(OPOST, c_oflag, 70) |
122 | #if defined(OLCUC) | 122 | #if defined(OLCUC) |
123 | TTYMODE(OLCUC, c_oflag, 71) SGTTYMODE(LCASE, tio.sg_flags, 71) | 123 | TTYMODE(OLCUC, c_oflag, 71) |
124 | #endif | 124 | #endif |
125 | TTYMODE(ONLCR, c_oflag, 72) SGTTYMODE(CRMOD, tio.sg_flags, 72) | 125 | TTYMODE(ONLCR, c_oflag, 72) |
126 | #ifdef OCRNL | 126 | #ifdef OCRNL |
127 | TTYMODE(OCRNL, c_oflag, 73) /* n/a */ | 127 | TTYMODE(OCRNL, c_oflag, 73) |
128 | #endif | 128 | #endif |
129 | #ifdef ONOCR | 129 | #ifdef ONOCR |
130 | TTYMODE(ONOCR, c_oflag, 74) /* n/a */ | 130 | TTYMODE(ONOCR, c_oflag, 74) |
131 | #endif | 131 | #endif |
132 | #ifdef ONLRET | 132 | #ifdef ONLRET |
133 | TTYMODE(ONLRET, c_oflag, 75) /* n/a */ | 133 | TTYMODE(ONLRET, c_oflag, 75) |
134 | #endif | 134 | #endif |
135 | 135 | ||
136 | TTYMODE(CS7, c_cflag, 90) /* n/a */ | 136 | TTYMODE(CS7, c_cflag, 90) |
137 | TTYMODE(CS8, c_cflag, 91) SGTTYMODE(LPASS8, tiolm, 91) | 137 | TTYMODE(CS8, c_cflag, 91) |
138 | TTYMODE(PARENB, c_cflag, 92) /* n/a */ | 138 | TTYMODE(PARENB, c_cflag, 92) |
139 | TTYMODE(PARODD, c_cflag, 93) SGTTYMODE(ODDP, tio.sg_flags, 93) | 139 | TTYMODE(PARODD, c_cflag, 93) |
140 | |||