From d4b58c71a21b1f380612eb0e45b312e4c91e2a95 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 24 Oct 2010 00:45:57 +0000 Subject: Sync OpenBSD patchset 775: Trying to set FD_CLOEXEC on every fd is a lost cause, just use closefrom() before exec. --- window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'window.c') diff --git a/window.c b/window.c index e23dda55..a1dbe4c2 100644 --- a/window.c +++ b/window.c @@ -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 @@ -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); -- cgit