Move all calls to fcntl(...O_NONBLOCK) into a function and clear the

flag on the stdio file descriptors before closing them (fixes things
like "tmux ls && cat").
This commit is contained in:
Nicholas Marriott
2011-01-08 01:52:36 +00:00
parent 703160b5d6
commit 69cb1f830e
9 changed files with 46 additions and 57 deletions

View File

@ -53,7 +53,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
struct client *c;
struct window_pane *wp;
char *command;
int old_fd, pipe_fd[2], null_fd, mode;
int old_fd, pipe_fd[2], null_fd;
if ((c = cmd_find_client(ctx, NULL)) == NULL)
return (-1);
@ -127,10 +127,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
NULL, NULL, cmd_pipe_pane_error_callback, wp);
bufferevent_enable(wp->pipe_event, EV_WRITE);
if ((mode = fcntl(wp->pipe_fd, F_GETFL)) == -1)
fatal("fcntl failed");
if (fcntl(wp->pipe_fd, F_SETFL, mode|O_NONBLOCK) == -1)
fatal("fcntl failed");
setblocking(wp->pipe_fd, 0);
return (0);
}
}