jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

greatly improve freopen behavior

Browse source 
1. don't open /dev/null just as a basis to copy flags; use shared
__fmodeflags function to get the right file flags for the mode.

2. handle the case (probably invalid, but whatever) case where the
original stream's file descriptor was closed; previously, the logic
re-closed it.

3. accept the "e" mode flag for close-on-exec; update dup3 to fallback
to using dup2 so we can simply call __dup3 instead of putting fallback
logic in freopen itself.
This commit is contained in:
Rich Felker 2012-10-24 21:16:06 -04:00
commit 892cafff66
5 changed files with 41 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/stdio/fopen.c
View file

@ -13,14 +13,7 @@ FILE *fopen(const char *restrict filename, const char *restrict mode)
}
/* Compute the flags to pass to open() */
if (strchr(mode, '+')) flags = O_RDWR;
else if (*mode == 'r') flags = O_RDONLY;
else flags = O_WRONLY;
if (strchr(mode, 'x')) flags |= O_EXCL;
if (strchr(mode, 'e')) flags |= O_CLOEXEC;
if (*mode != 'r') flags |= O_CREAT;
if (*mode == 'w') flags |= O_TRUNC;
if (*mode == 'a') flags |= O_APPEND;
flags = __fmodeflags(mode);
fd = syscall_cp(SYS_open, filename, flags|O_LARGEFILE, 0666);
if (fd < 0) return 0;