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

16
src/stdio/__fmodeflags.c Normal file
View file

@ -0,0 +1,16 @@
#include <fcntl.h>
#include <string.h>
int __fmodeflags(const char *mode)
{
int flags;
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;
return flags;
}

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;

17
src/stdio/freopen.c
View file

@ -7,24 +7,27 @@
/* Locking is not necessary because, in the event of failure, the stream
* passed to freopen is invalid as soon as freopen is called. */
int __dup3(int, int, int);
FILE *freopen(const char *restrict filename, const char *restrict mode, FILE *restrict f)
{
int fl;
int fl = __fmodeflags(mode);
FILE *f2;
fflush(f);
if (!filename) {
f2 = fopen("/dev/null", mode);
if (!f2) goto fail;
fl = __syscall(SYS_fcntl, f2->fd, F_GETFL, 0);
if (fl&O_CLOEXEC)
__syscall(SYS_fcntl, f->fd, F_SETFD, FD_CLOEXEC);
fl &= ~(O_CREAT|O_EXCL|O_CLOEXEC);
if (syscall(SYS_fcntl, f->fd, F_SETFL, fl) < 0)
goto fail2;
goto fail;
return f;
} else {
f2 = fopen(filename, mode);
if (!f2) goto fail;
if (syscall(SYS_dup2, f2->fd, f->fd) < 0)
goto fail2;
if (f2->fd == f->fd) f2->fd = -1; /* avoid closing in fclose */
else if (__dup3(f2->fd, f->fd, fl&O_CLOEXEC)<0) goto fail2;
}
f->flags = (f->flags & F_PERM) | f2->flags;