mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-25 09:47:17 +00:00
Code Issues 1 Releases Wiki Activity

Merge pull request #385 from andrewchambers/fnctlfix

Browse Source 
Avoid setting O_CLOEXEC on stdin/stdout/stderr.
This commit is contained in:
Calvin Rose 2020-05-09 11:34:37 -04:00 committed by GitHub
commit 0615d09b7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/io.c
View File

@ -92,7 +92,8 @@ static Janet makef(FILE *f, int flags) {
#ifndef JANET_WINDOWS #ifndef JANET_WINDOWS
/* While we would like fopen to set cloexec by default (like O_CLOEXEC) with the e flag, that is /* While we would like fopen to set cloexec by default (like O_CLOEXEC) with the e flag, that is
* not standard. */ * not standard. */
fcntl(fileno(f), F_SETFD, FD_CLOEXEC); if (!(flags & JANET_FILE_NOT_CLOSEABLE))
fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
#endif #endif
return janet_wrap_abstract(iof); return janet_wrap_abstract(iof);
} }
@ -136,22 +137,10 @@ static Janet cfun_io_popen(int32_t argc, Janet *argv) {
static Janet cfun_io_temp(int32_t argc, Janet *argv) { static Janet cfun_io_temp(int32_t argc, Janet *argv) {
(void)argv; (void)argv;
janet_fixarity(argc, 0); janet_fixarity(argc, 0);
// XXX use mkostemp when we can to avoid CLOEXEC race.
FILE *tmp = tmpfile(); FILE *tmp = tmpfile();
if (!tmp) if (!tmp)
janet_panicf("unable to create temporary file - %s", strerror(errno)); janet_panicf("unable to create temporary file - %s", strerror(errno));
#ifndef JANET_WINDOWS
/* It seems highly unlikely a typical janet user wants a tempfile to be inherited and
libc tmpfile does NOT set O_CLOEXEC by default.
For threaded programs we should use mkostemp
which is coming to POSIX at a later time. */
if (fcntl(fileno(tmp), F_SETFD, FD_CLOEXEC) != 0) {
fclose(tmp);
janet_panic("unable initialize temporary file");
}
#endif
return janet_makefile(tmp, JANET_FILE_WRITE | JANET_FILE_READ | JANET_FILE_BINARY); return janet_makefile(tmp, JANET_FILE_WRITE | JANET_FILE_READ | JANET_FILE_BINARY);
} }