aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-01-22 19:14:10 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-01-22 19:14:10 +0000
commitaa70f28069739d968502ef5a8048ffe8fbd10ffe (patch)
treed06f810e6d86f0d63f004e0263771c8e51129fdb
parentacf331f7f138217c59c09d58ac5f16220b1c8924 (diff)
parentc17b0a202aba4cbf9490c130d3d9a4966c559fc2 (diff)
downloadrtmux-aa70f28069739d968502ef5a8048ffe8fbd10ffe.tar.gz
rtmux-aa70f28069739d968502ef5a8048ffe8fbd10ffe.tar.bz2
rtmux-aa70f28069739d968502ef5a8048ffe8fbd10ffe.zip
Merge branch 'master' of github.com:tmux/tmux
-rw-r--r--client.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/client.c b/client.c
index 1c6c8bff..e3d65964 100644
--- a/client.c
+++ b/client.c
@@ -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,
client_stdin_callback, NULL);
if (client_flags & CLIENT_CONTROLCONTROL) {
- if (tcgetattr(STDIN_FILENO, &saved_tio) != 0)
- fatal("tcgetattr failed");
+ if (tcgetattr(STDIN_FILENO, &saved_tio) != 0) {
+ fprintf(stderr, "tcgetattr failed: %s\n",
+ strerror(errno));
+ return (1);
+ }
cfmakeraw(&tio);
tio.c_iflag = ICRNL|IXANY;
tio.c_oflag = OPOST|ONLCR;