diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-10-24 00:45:57 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-10-24 00:45:57 +0000 |
| commit | d4b58c71a21b1f380612eb0e45b312e4c91e2a95 (patch) | |
| tree | 3250dd46942f127d5faf97e8a5bfc196f54a6dbc /window.c | |
| parent | 5fb4f8c1fa3e2a21be846f4fe13c4f6919ff54b2 (diff) | |
| download | rtmux-d4b58c71a21b1f380612eb0e45b312e4c91e2a95.tar.gz rtmux-d4b58c71a21b1f380612eb0e45b312e4c91e2a95.tar.bz2 rtmux-d4b58c71a21b1f380612eb0e45b312e4c91e2a95.zip | |
Sync OpenBSD patchset 775:
Trying to set FD_CLOEXEC on every fd is a lost cause, just use
closefrom() before exec.
Diffstat (limited to 'window.c')
| -rw-r--r-- | window.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: window.c,v 1.137 2010-09-07 19:32:58 nicm Exp $ */ +/* $Id: window.c,v 1.138 2010-10-24 00:45:57 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -570,6 +570,8 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell, if (tcsetattr(STDIN_FILENO, TCSANOW, &tio2) != 0) fatal("tcgetattr failed"); + closefrom(STDERR_FILENO + 1); + environ_push(env); clear_signals(1); @@ -600,8 +602,6 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell, fatal("fcntl failed"); if (fcntl(wp->fd, F_SETFL, mode|O_NONBLOCK) == -1) fatal("fcntl failed"); - if (fcntl(wp->fd, F_SETFD, FD_CLOEXEC) == -1) - fatal("fcntl failed"); wp->event = bufferevent_new(wp->fd, window_pane_read_callback, NULL, window_pane_error_callback, wp); bufferevent_enable(wp->event, EV_READ|EV_WRITE); |