| Index: fusl/src/stdio/freopen.c
|
| diff --git a/fusl/src/stdio/freopen.c b/fusl/src/stdio/freopen.c
|
| index 6c1b575f527963566a7b457f29c18dea45b2505a..ba4be9ab0cb6c204ec075a404bb9aa2e3b08c77d 100644
|
| --- a/fusl/src/stdio/freopen.c
|
| +++ b/fusl/src/stdio/freopen.c
|
| @@ -11,44 +11,48 @@
|
|
|
| int __dup3(int, int, int);
|
|
|
| -FILE *freopen(const char *restrict filename, const char *restrict mode, FILE *restrict f)
|
| -{
|
| - int fl = __fmodeflags(mode);
|
| - FILE *f2;
|
| -
|
| - FLOCK(f);
|
| -
|
| - fflush(f);
|
| -
|
| - if (!filename) {
|
| - 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 fail;
|
| - } else {
|
| - f2 = fopen(filename, mode);
|
| - if (!f2) goto fail;
|
| - 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;
|
| - f->read = f2->read;
|
| - f->write = f2->write;
|
| - f->seek = f2->seek;
|
| - f->close = f2->close;
|
| -
|
| - fclose(f2);
|
| - }
|
| -
|
| - FUNLOCK(f);
|
| - return f;
|
| +FILE* freopen(const char* restrict filename,
|
| + const char* restrict mode,
|
| + FILE* restrict f) {
|
| + int fl = __fmodeflags(mode);
|
| + FILE* f2;
|
| +
|
| + FLOCK(f);
|
| +
|
| + fflush(f);
|
| +
|
| + if (!filename) {
|
| + 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 fail;
|
| + } else {
|
| + f2 = fopen(filename, mode);
|
| + if (!f2)
|
| + goto fail;
|
| + 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;
|
| + f->read = f2->read;
|
| + f->write = f2->write;
|
| + f->seek = f2->seek;
|
| + f->close = f2->close;
|
| +
|
| + fclose(f2);
|
| + }
|
| +
|
| + FUNLOCK(f);
|
| + return f;
|
|
|
| fail2:
|
| - fclose(f2);
|
| + fclose(f2);
|
| fail:
|
| - fclose(f);
|
| - return NULL;
|
| + fclose(f);
|
| + return NULL;
|
| }
|
|
|
| LFS64(freopen);
|
|
|