diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | ttymodes.c | 6 |
2 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20010416 | ||
2 | - OpenBSD CVS Sync | ||
3 | - stevesk@cvs.openbsd.org 2001/04/15 01:35:22 | ||
4 | [ttymodes.c] | ||
5 | fix comments | ||
6 | |||
1 | 20010415 | 7 | 20010415 |
2 | - OpenBSD CVS Sync | 8 | - OpenBSD CVS Sync |
3 | - deraadt@cvs.openbsd.org 2001/04/14 04:31:01 | 9 | - deraadt@cvs.openbsd.org 2001/04/14 04:31:01 |
@@ -15,7 +21,7 @@ | |||
15 | - stevesk@cvs.openbsd.org 2001/04/14 17:04:42 | 21 | - stevesk@cvs.openbsd.org 2001/04/14 17:04:42 |
16 | [scp.c] | 22 | [scp.c] |
17 | 'T' handling rcp/scp sync; ok markus@ | 23 | 'T' handling rcp/scp sync; ok markus@ |
18 | - Missed sshtty.[ch] in Sync. | 24 | - Missed sshtty.[ch] in Sync. |
19 | 25 | ||
20 | 20010414 | 26 | 20010414 |
21 | - Sync with OpenBSD glob.c, strlcat.c and vis.c changes | 27 | - Sync with OpenBSD glob.c, strlcat.c and vis.c changes |
@@ -5082,4 +5088,4 @@ | |||
5082 | - Wrote replacements for strlcpy and mkdtemp | 5088 | - Wrote replacements for strlcpy and mkdtemp |
5083 | - Released 1.0pre1 | 5089 | - Released 1.0pre1 |
5084 | 5090 | ||
5085 | $Id: ChangeLog,v 1.1116 2001/04/14 23:21:50 mouring Exp $ | 5091 | $Id: ChangeLog,v 1.1117 2001/04/15 14:25:12 mouring Exp $ |
diff --git a/ttymodes.c b/ttymodes.c index 9ce3fbcc4..6124cb4b1 100644 --- a/ttymodes.c +++ b/ttymodes.c | |||
@@ -43,7 +43,7 @@ | |||
43 | */ | 43 | */ |
44 | 44 | ||
45 | #include "includes.h" | 45 | #include "includes.h" |
46 | RCSID("$OpenBSD: ttymodes.c,v 1.12 2001/04/14 16:33:20 stevesk Exp $"); | 46 | RCSID("$OpenBSD: ttymodes.c,v 1.13 2001/04/15 01:35:22 stevesk Exp $"); |
47 | 47 | ||
48 | #include "packet.h" | 48 | #include "packet.h" |
49 | #include "log.h" | 49 | #include "log.h" |
@@ -428,7 +428,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr) | |||
428 | } else { | 428 | } else { |
429 | /* | 429 | /* |
430 | * SSH2: | 430 | * SSH2: |
431 | * Opcodes 0 to 159 are defined to have | 431 | * Opcodes 1 to 159 are defined to have |
432 | * a uint32 argument. | 432 | * a uint32 argument. |
433 | * Opcodes 160 to 255 are undefined and | 433 | * Opcodes 160 to 255 are undefined and |
434 | * cause parsing to stop. | 434 | * cause parsing to stop. |
@@ -453,7 +453,7 @@ set: | |||
453 | return; /* Don't process bytes passed */ | 453 | return; /* Don't process bytes passed */ |
454 | } | 454 | } |
455 | if (failure == -1) | 455 | if (failure == -1) |
456 | return; /* Packet parsed ok but tty stuff failed */ | 456 | return; /* Packet parsed ok but tcgetattr() failed */ |
457 | 457 | ||
458 | /* Set the new modes for the terminal. */ | 458 | /* Set the new modes for the terminal. */ |
459 | if (tcsetattr(fd, TCSANOW, &tio) == -1) | 459 | if (tcsetattr(fd, TCSANOW, &tio) == -1) |