diff options
| author | Erlang/OTP <[email protected]> | 2015-01-30 16:56:52 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-01-30 16:56:52 +0100 |
| commit | 6bc8b0da4b1369201d1e229f4375f79cdcb2c594 (patch) | |
| tree | adf87dbbf9ab0512fc01bd214b5f9b9a2aa2f02c /erts | |
| parent | 30e91c934635836ebe126b3444e73eb50b506ec0 (diff) | |
| parent | 7e16e552e24859025e9029c9f24277596b59b3be (diff) | |
| download | otp-6bc8b0da4b1369201d1e229f4375f79cdcb2c594.tar.gz otp-6bc8b0da4b1369201d1e229f4375f79cdcb2c594.tar.bz2 otp-6bc8b0da4b1369201d1e229f4375f79cdcb2c594.zip | |
Merge branch 'egil/fix-child_setup-close/OTP-12446' into maint-17
* egil/fix-child_setup-close/OTP-12446:
erts: Use closefrom() if available when closing fds
erts: Don't close all fds twice in child_setup
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/sys/unix/erl_child_setup.c | 13 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 6 |
2 files changed, 8 insertions, 11 deletions
diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c index 94eb6b1547..5ad92dad02 100644 --- a/erts/emulator/sys/unix/erl_child_setup.c +++ b/erts/emulator/sys/unix/erl_child_setup.c @@ -101,7 +101,9 @@ main(int argc, char *argv[]) if (sscanf(argv[CS_ARGV_FD_CR_IX], "%d:%d", &from, &to) != 2) return 1; -#if defined(__ANDROID__) +#if defined(HAVE_CLOSEFROM) + closefrom(from); +#elif defined(__ANDROID__) for (i = from; i <= to; i++) { if (i!=__system_properties_fd) (void) close(i); @@ -109,13 +111,6 @@ main(int argc, char *argv[]) #else for (i = from; i <= to; i++) (void) close(i); -#endif /* __ANDROID__ */ - -#if defined(HAVE_CLOSEFROM) - closefrom(from); -#else - for (i = from; i <= to; i++) - (void) close(i); #endif if (!(argv[CS_ARGV_WD_IX][0] == '.' && argv[CS_ARGV_WD_IX][1] == '\0') @@ -147,8 +142,6 @@ main(int argc, char *argv[]) return 1; } - - #if defined(__ANDROID__) int __system_properties_fd(void) { diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index eff64b2c11..cd87b320e2 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -1560,9 +1560,13 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* op goto child_error; } +#if defined(HAVE_CLOSEFROM) + closefrom(opts->use_stdio ? 3 : 5); +#else for (i = opts->use_stdio ? 3 : 5; i < max_files; i++) (void) close(i); - +#endif + if (opts->wd && chdir(opts->wd) < 0) goto child_error; |