From 77f9c49829fa6c9f33f14ed7cf43ecb4827b54bc Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 28 Jul 2010 22:15:15 +0000 Subject: [PATCH] dup() the stdin fd so it isn't closed twice (once for stdin, once for tty). --- server-client.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/server-client.c b/server-client.c index a27089b4..b8ccbeff 100644 --- a/server-client.c +++ b/server-client.c @@ -648,9 +648,11 @@ server_client_msg_dispatch(struct client *c) fatalx("MSG_IDENTIFY missing fd"); memcpy(&identifydata, imsg.data, sizeof identifydata); - c->stdin_fd = imsg.fd; - c->stdin_event = bufferevent_new(imsg.fd, NULL, NULL, - server_client_in_callback, c); + c->stdin_fd = dup(imsg.fd); + if (c->stdin_fd == -1) + fatal("dup failed"); + c->stdin_event = bufferevent_new(c->stdin_fd, + NULL, NULL, server_client_in_callback, c); if (c->stdin_event == NULL) fatalx("failed to create stdin event"); @@ -668,14 +670,14 @@ server_client_msg_dispatch(struct client *c) fatalx("MSG_STDOUT missing fd"); c->stdout_fd = imsg.fd; - c->stdout_event = bufferevent_new(imsg.fd, NULL, NULL, - server_client_out_callback, c); + c->stdout_event = bufferevent_new(c->stdout_fd, + NULL, NULL, server_client_out_callback, c); if (c->stdout_event == NULL) fatalx("failed to create stdout event"); - if ((mode = fcntl(imsg.fd, F_GETFL)) != -1) - fcntl(imsg.fd, F_SETFL, mode|O_NONBLOCK); - if (fcntl(imsg.fd, F_SETFD, FD_CLOEXEC) == -1) + if ((mode = fcntl(c->stdout_fd, F_GETFL)) != -1) + fcntl(c->stdout_fd, F_SETFL, mode|O_NONBLOCK); + if (fcntl(c->stdout_fd, F_SETFD, FD_CLOEXEC) == -1) fatal("fcntl failed"); break; case MSG_STDERR: @@ -685,14 +687,14 @@ server_client_msg_dispatch(struct client *c) fatalx("MSG_STDERR missing fd"); c->stderr_fd = imsg.fd; - c->stderr_event = bufferevent_new(imsg.fd, NULL, NULL, - server_client_err_callback, c); + c->stderr_event = bufferevent_new(c->stderr_fd, + NULL, NULL, server_client_err_callback, c); if (c->stderr_event == NULL) fatalx("failed to create stderr event"); - if ((mode = fcntl(imsg.fd, F_GETFL)) != -1) - fcntl(imsg.fd, F_SETFL, mode|O_NONBLOCK); - if (fcntl(imsg.fd, F_SETFD, FD_CLOEXEC) == -1) + if ((mode = fcntl(c->stderr_fd, F_GETFL)) != -1) + fcntl(c->stderr_fd, F_SETFL, mode|O_NONBLOCK); + if (fcntl(c->stderr_fd, F_SETFD, FD_CLOEXEC) == -1) fatal("fcntl failed"); break; case MSG_RESIZE: