[ttymodes.c]
     spacing
This commit is contained in:
Damien Miller 2006-03-26 14:10:34 +11:00
parent 4f7becb44f
commit a5a2859275
2 changed files with 15 additions and 8 deletions

View File

@ -101,6 +101,9 @@
- deraadt@cvs.openbsd.org 2006/03/20 18:48:34 - deraadt@cvs.openbsd.org 2006/03/20 18:48:34
[channels.c fatal.c kex.c packet.c serverloop.c] [channels.c fatal.c kex.c packet.c serverloop.c]
spacing spacing
- deraadt@cvs.openbsd.org 2006/03/20 21:11:53
[ttymodes.c]
spacing
20060325 20060325
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4358,4 +4361,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4271 2006/03/26 03:10:14 djm Exp $ $Id: ChangeLog,v 1.4272 2006/03/26 03:10:34 djm Exp $

View File

@ -385,7 +385,8 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
n_bytes += 4; n_bytes += 4;
baud = packet_get_int(); baud = packet_get_int();
debug3("tty_parse_modes: ispeed %d", baud); debug3("tty_parse_modes: ispeed %d", baud);
if (failure != -1 && cfsetispeed(&tio, baud_to_speed(baud)) == -1) if (failure != -1 &&
cfsetispeed(&tio, baud_to_speed(baud)) == -1)
error("cfsetispeed failed for %d", baud); error("cfsetispeed failed for %d", baud);
break; break;
@ -395,7 +396,8 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
n_bytes += 4; n_bytes += 4;
baud = packet_get_int(); baud = packet_get_int();
debug3("tty_parse_modes: ospeed %d", baud); debug3("tty_parse_modes: ospeed %d", baud);
if (failure != -1 && cfsetospeed(&tio, baud_to_speed(baud)) == -1) if (failure != -1 &&
cfsetospeed(&tio, baud_to_speed(baud)) == -1)
error("cfsetospeed failed for %d", baud); error("cfsetospeed failed for %d", baud);
break; break;
@ -443,11 +445,12 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
/* /*
* It is a truly undefined opcode (160 to 255). * It is a truly undefined opcode (160 to 255).
* We have no idea about its arguments. So we * We have no idea about its arguments. So we
* must stop parsing. Note that some data may be * must stop parsing. Note that some data
* left in the packet; hopefully there is nothing * may be left in the packet; hopefully there
* more coming after the mode data. * is nothing more coming after the mode data.
*/ */
logit("parse_tty_modes: unknown opcode %d", opcode); logit("parse_tty_modes: unknown opcode %d",
opcode);
goto set; goto set;
} }
} else { } else {
@ -463,7 +466,8 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
(void) packet_get_int(); (void) packet_get_int();
break; break;
} else { } else {
logit("parse_tty_modes: unknown opcode %d", opcode); logit("parse_tty_modes: unknown opcode %d",
opcode);
goto set; goto set;
} }
} }