summaryrefslogtreecommitdiff
path: root/ttymodes.c
diff options
context:
space:
mode:
Diffstat (limited to 'ttymodes.c')
-rw-r--r--ttymodes.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/ttymodes.c b/ttymodes.c
index 5cc13dcd5..c32e213a4 100644
--- a/ttymodes.c
+++ b/ttymodes.c
@@ -43,7 +43,7 @@
43 */ 43 */
44 44
45#include "includes.h" 45#include "includes.h"
46RCSID("$OpenBSD: ttymodes.c,v 1.18 2002/06/19 00:27:55 deraadt Exp $"); 46RCSID("$OpenBSD: ttymodes.c,v 1.19 2003/04/08 20:21:29 itojun Exp $");
47 47
48#include "packet.h" 48#include "packet.h"
49#include "log.h" 49#include "log.h"
@@ -267,7 +267,7 @@ tty_make_modes(int fd, struct termios *tiop)
267 267
268 if (tiop == NULL) { 268 if (tiop == NULL) {
269 if (tcgetattr(fd, &tio) == -1) { 269 if (tcgetattr(fd, &tio) == -1) {
270 log("tcgetattr: %.100s", strerror(errno)); 270 logit("tcgetattr: %.100s", strerror(errno));
271 goto end; 271 goto end;
272 } 272 }
273 } else 273 } else
@@ -341,7 +341,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
341 * modes, they will initially have reasonable values. 341 * modes, they will initially have reasonable values.
342 */ 342 */
343 if (tcgetattr(fd, &tio) == -1) { 343 if (tcgetattr(fd, &tio) == -1) {
344 log("tcgetattr: %.100s", strerror(errno)); 344 logit("tcgetattr: %.100s", strerror(errno));
345 failure = -1; 345 failure = -1;
346 } 346 }
347 347
@@ -420,7 +420,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
420 * left in the packet; hopefully there is nothing 420 * left in the packet; hopefully there is nothing
421 * more coming after the mode data. 421 * more coming after the mode data.
422 */ 422 */
423 log("parse_tty_modes: unknown opcode %d", opcode); 423 logit("parse_tty_modes: unknown opcode %d", opcode);
424 goto set; 424 goto set;
425 } 425 }
426 } else { 426 } else {
@@ -436,7 +436,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
436 (void) packet_get_int(); 436 (void) packet_get_int();
437 break; 437 break;
438 } else { 438 } else {
439 log("parse_tty_modes: unknown opcode %d", opcode); 439 logit("parse_tty_modes: unknown opcode %d", opcode);
440 goto set; 440 goto set;
441 } 441 }
442 } 442 }
@@ -446,7 +446,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
446set: 446set:
447 if (*n_bytes_ptr != n_bytes) { 447 if (*n_bytes_ptr != n_bytes) {
448 *n_bytes_ptr = n_bytes; 448 *n_bytes_ptr = n_bytes;
449 log("parse_tty_modes: n_bytes_ptr != n_bytes: %d %d", 449 logit("parse_tty_modes: n_bytes_ptr != n_bytes: %d %d",
450 *n_bytes_ptr, n_bytes); 450 *n_bytes_ptr, n_bytes);
451 return; /* Don't process bytes passed */ 451 return; /* Don't process bytes passed */
452 } 452 }
@@ -455,5 +455,5 @@ set:
455 455
456 /* Set the new modes for the terminal. */ 456 /* Set the new modes for the terminal. */
457 if (tcsetattr(fd, TCSANOW, &tio) == -1) 457 if (tcsetattr(fd, TCSANOW, &tio) == -1)
458 log("Setting tty modes failed: %.100s", strerror(errno)); 458 logit("Setting tty modes failed: %.100s", strerror(errno));
459} 459}