refactor headers, especially alltypes.h, and improve C++ ABI compat

[musl] / src / internal / stdio_impl.h

diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index 90a8214..2083b2f 100644 (file)
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -2,30 +2,14 @@
 #define _STDIO_IMPL_H
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <inttypes.h>
-#include <wchar.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <errno.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <ctype.h>
-#include <sys/wait.h>
-#include <math.h>
-#include <float.h>
-#include <sys/uio.h>
 #include "syscall.h"
 #include "libc.h"
 
 #define UNGET 8
 
-#define FLOCK(f) ((libc.lockfile && (f)->lock>=0) ? (libc.lockfile((f)),0) : 0)
-#define FUNLOCK(f) ((f)->lockcount && (--(f)->lockcount || ((f)->lock=0)))
+#define FFINALLOCK(f) ((f)->lock>=0 ? __lockfile((f)) : 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
@@ -34,7 +18,7 @@
 #define F_ERR 32
 #define F_SVB 64
 
-struct __FILE_s {
+struct _IO_FILE {
        unsigned flags;
        unsigned char *rpos, *rend;
        int (*close)(FILE *);
@@ -49,16 +33,18 @@ struct __FILE_s {
        FILE *prev, *next;
        int fd;
        int pipe_pid;
-       long dummy2;
+       long lockcount;
        short dummy3;
        signed char mode;
        signed char lbf;
        int lock;
-       int lockcount;
+       int waiters;
        void *cookie;
        off_t off;
-       int (*flush)(FILE *);
+       char *getln_buf;
        void *mustbezero_2;
+       unsigned char *shend;
+       off_t shlim, shcnt;
 };
 
 size_t __stdio_read(FILE *, unsigned char *, size_t);
@@ -67,13 +53,15 @@ 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 *);
-int __underflow(FILE *);
+#if defined(__PIC__) && (100*__GNUC__+__GNUC_MINOR__ >= 303)
+__attribute__((visibility("protected")))
+#endif
+int __overflow(FILE *, int), __uflow(FILE *);
 
 int __fseeko(FILE *, off_t, int);
 int __fseeko_unlocked(FILE *, off_t, int);
@@ -83,10 +71,10 @@ 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)