diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-08-09 21:45:37 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-08-09 21:45:37 +0000 |
| commit | 4387db506f558ec30bdbbd9b57b4c9f04c366e4f (patch) | |
| tree | 73b8ab3b9b30cbf783387c8d29a01f0eac771ab3 | |
| parent | d7bae0edce6690087b9aa481187325d5ac4bd345 (diff) | |
| download | rtmux-4387db506f558ec30bdbbd9b57b4c9f04c366e4f.tar.gz rtmux-4387db506f558ec30bdbbd9b57b4c9f04c366e4f.tar.bz2 rtmux-4387db506f558ec30bdbbd9b57b4c9f04c366e4f.zip | |
Sync OpenBSD patchset 742:
dup() the stdin fd so it isn't closed twice (once for stdin, once for tty).
| -rw-r--r-- | server-client.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/server-client.c b/server-client.c index b1b2f2db..251a0094 100644 --- a/server-client.c +++ b/server-client.c @@ -1,4 +1,4 @@ -/* $Id: server-client.c,v 1.37 2010-08-09 21:44:25 tcunha Exp $ */ +/* $Id: server-client.c,v 1.38 2010-08-09 21:45:37 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -647,9 +647,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"); @@ -667,14 +669,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: @@ -684,14 +686,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: |