diff --git a/ChangeLog b/ChangeLog index f0519a0fe..abc838e64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ + 2009-01-24 Patrick Winnertz * edit/editcmd.c: Fix some issues about regex: @@ -8,6 +9,8 @@ * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules for Nemerle source files + * src/subshell.c: merged 174_4.6_mandriva_pty_closeonexec + (patch from mandriva) 2009-01-19 Patrick Winnertz @@ -23,6 +26,11 @@ * src/main.c: Removed unused function do_mc_filename_rename * src/util.c: Removed unused struct whentm +2009-01-16 Enrico Weigelt, metux IT service + + * src/subshell: setting subshell pty to close-on-exec + (taken from mandriva patches) + 2009-01-14 Slava Zanko * lib/mc.ext.in: change filemask for recognize 7z-files diff --git a/src/subshell.c b/src/subshell.c index 32d91fe85..99cf28ce4 100644 --- a/src/subshell.c +++ b/src/subshell.c @@ -1110,6 +1110,7 @@ pty_open_slave (const char *pty_name) #endif /* I_FIND && I_PUSH */ #endif /* __osf__ || __linux__ */ + fcntl(pty_slave, F_SETFD, FD_CLOEXEC); return pty_slave; } @@ -1163,6 +1164,7 @@ pty_open_slave (const char *pty_name) } if ((pty_slave = open (pty_name, O_RDWR)) == -1) fprintf (stderr, "open (pty_name, O_RDWR): %s\r\n", pty_name); + fcntl(pty_slave, F_SETFD, FD_CLOEXEC); return pty_slave; }