Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-01-20 16:01:11 +00:00
commit c17b0a202a

View File

@ -314,8 +314,11 @@ client_main(struct event_base *base, int argc, char **argv, int flags,
event_set(&client_stdin, STDIN_FILENO, EV_READ|EV_PERSIST, event_set(&client_stdin, STDIN_FILENO, EV_READ|EV_PERSIST,
client_stdin_callback, NULL); client_stdin_callback, NULL);
if (client_flags & CLIENT_CONTROLCONTROL) { if (client_flags & CLIENT_CONTROLCONTROL) {
if (tcgetattr(STDIN_FILENO, &saved_tio) != 0) if (tcgetattr(STDIN_FILENO, &saved_tio) != 0) {
fatal("tcgetattr failed"); fprintf(stderr, "tcgetattr failed: %s\n",
strerror(errno));
return (1);
}
cfmakeraw(&tio); cfmakeraw(&tio);
tio.c_iflag = ICRNL|IXANY; tio.c_iflag = ICRNL|IXANY;
tio.c_oflag = OPOST|ONLCR; tio.c_oflag = OPOST|ONLCR;