circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow the file descriptor received from the client to be -1 - it can be on 

Cygwin when stdin is not a terminal. Reported by A Young, SF bug 52.
pull/1/head
Nicholas Marriott 2013-08-01 23:42:39 +01:00
parent bcd9bcae2a
commit 3a13e066ba
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server-client.c
View File

@ -829,9 +829,6 @@ server_client_msg_dispatch(struct client *c)
#ifdef __CYGWIN__ #ifdef __CYGWIN__
imsg.fd = open(identifydata.ttyname, O_RDWR|O_NOCTTY); imsg.fd = open(identifydata.ttyname, O_RDWR|O_NOCTTY);
#endif #endif
if (imsg.fd == -1)
fatalx("MSG_IDENTIFY missing fd");
server_client_msg_identify(c, &identifydata, imsg.fd); server_client_msg_identify(c, &identifydata, imsg.fd);
break; break;
case MSG_STDIN: case MSG_STDIN:
@ -975,6 +972,8 @@ server_client_msg_identify(
return; return;
} }
if (fd == -1)
return;
if (!isatty(fd)) { if (!isatty(fd)) {
close(fd); close(fd);
return; return;