greatly improve freopen behavior

[musl] / src / internal / stdio_impl.h

diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index 4e6d350..279e91f 100644 (file)
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -18,55 +18,62 @@
 #include <sys/wait.h>
 #include <math.h>
 #include <float.h>
+#include <sys/uio.h>
 #include "syscall.h"
 #include "libc.h"
 
-#define UNGET 4
+#define UNGET 8
 
-#define FLOCK(f) ((libc.lockfile && (f)->owner>=0) ? (libc.lockfile((f)),0) : 0)
-#define FUNLOCK(f) ((f)->lockcount && (--(f)->lockcount || ((f)->owner=(f)->lock=0)))
+#define FLOCK(f) int __need_unlock = ((f)->lock>=0 ? __lockfile((f)) : 0)
+#define FUNLOCK(f) if (__need_unlock) __unlockfile((f)); else
 
 #define F_PERM 1
 #define F_NORD 4
 #define F_NOWR 8
 #define F_EOF 16
 #define F_ERR 32
+#define F_SVB 64
 
 struct __FILE_s {
        unsigned flags;
-       unsigned char *rpos, *rstop;
-       unsigned char *rend, *wend;
-       unsigned char *wpos, *wstop;
+       unsigned char *rpos, *rend;
+       int (*close)(FILE *);
+       unsigned char *wend, *wpos;
+       unsigned char *mustbezero_1;
        unsigned char *wbase;
-       unsigned char *dummy01[3];
+       size_t (*read)(FILE *, unsigned char *, size_t);
+       size_t (*write)(FILE *, const unsigned char *, size_t);
+       off_t (*seek)(FILE *, off_t, int);
        unsigned char *buf;
        size_t buf_size;
        FILE *prev, *next;
        int fd;
        int pipe_pid;
-       long dummy2;
+       long lockcount;
        short dummy3;
-       char dummy4;
+       signed char mode;
        signed char lbf;
        int lock;
-       int lockcount;
+       int waiters;
        void *cookie;
        off_t off;
-       int (*flush)(FILE *);
-       void **wide_data; /* must be NULL */
-       size_t (*read)(FILE *, unsigned char *, size_t);
-       size_t (*write)(FILE *, const unsigned char *, size_t);
-       off_t (*seek)(FILE *, off_t, int);
-       int mode;
-       int (*close)(FILE *);
-       int owner;
+       char *getln_buf;
+       void *mustbezero_2;
+       unsigned char *shend;
+       off_t shlim, shcnt;
 };
 
 size_t __stdio_read(FILE *, unsigned char *, size_t);
 size_t __stdio_write(FILE *, const unsigned char *, size_t);
+size_t __stdout_write(FILE *, const unsigned char *, size_t);
 off_t __stdio_seek(FILE *, off_t, int);
 int __stdio_close(FILE *);
 
+size_t __string_read(FILE *, unsigned char *, size_t);
+
+int __toread(FILE *);
+int __towrite(FILE *);
+
 int __overflow(FILE *, int);
 int __oflow(FILE *);
 int __uflow(FILE *);
@@ -80,14 +87,20 @@ size_t __fwritex(const unsigned char *, size_t, FILE *);
 int __putc_unlocked(int, FILE *);
 
 FILE *__fdopen(int, const char *);
+int __fmodeflags(const char *);
 
-#define OFLLOCK() LOCK(&libc.ofl_lock)
-#define OFLUNLOCK() UNLOCK(&libc.ofl_lock)
-#define ofl_head (libc.ofl_head)
+#define OFLLOCK() LOCK(libc.ofl_lock)
+#define OFLUNLOCK() UNLOCK(libc.ofl_lock)
 
 #define feof(f) ((f)->flags & F_EOF)
 #define ferror(f) ((f)->flags & F_ERR)
 
+#define getc_unlocked(f) \
+       ( ((f)->rpos < (f)->rend) ? *(f)->rpos++ : __uflow((f)) )
+
+#define putc_unlocked(c, f) ( ((c)!=(f)->lbf && (f)->wpos<(f)->wend) \
+       ? *(f)->wpos++ = (c) : __overflow((f),(c)) )
+
 /* Caller-allocated FILE * operations */
 FILE *__fopen_rb_ca(const char *, FILE *, unsigned char *, size_t);
 int __fclose_ca(FILE *);