9448b0513e
the arch-specific bits/alltypes.h.sh has been replaced with a generic alltypes.h.in and minimal arch-specific bits/alltypes.h.in. this commit is intended to have no functional changes except: - exposing additional symbols that POSIX allows but does not require - changing the C++ name mangling for some types - fixing the signedness of blksize_t on powerpc (POSIX requires signed) - fixing the limit macros for sig_atomic_t on x86_64 - making dev_t an unsigned type (ABI matching goal, and more logical) in addition, some types that were wrongly defined with long on 32-bit archs were changed to int, and vice versa; this change is non-functional except for the possibility of making pointer types mismatch, and only affects programs that were using them incorrectly, and only at build-time, not runtime. the following changes were made in the interest of moving non-arch-specific types out of the alltypes system and into the headers they're associated with, and also will tend to improve application compatibility: - netdb.h now includes netinet/in.h (for socklen_t and uint32_t) - netinet/in.h now includes sys/socket.h and inttypes.h - sys/resource.h now includes sys/time.h (for struct timeval) - sys/wait.h now includes signal.h (for siginfo_t) - langinfo.h now includes nl_types.h (for nl_item) for the types in stdint.h: - types which are of no interest to other headers were moved out of the alltypes system. - fast types for 8- and 64-bit are hard-coded (at least for now); only the 16- and 32-bit ones have reason to vary by arch. and the following types have been changed for C++ ABI purposes; - mbstate_t now has a struct tag, __mbstate_t - FILE's struct tag has been changed to _IO_FILE - DIR's struct tag has been changed to __dirstream - locale_t's struct tag has been changed to __locale_struct - pthread_t is defined as unsigned long in C++ mode only - fpos_t now has a struct tag, _G_fpos64_t - fsid_t's struct tag has been changed to __fsid_t - idtype_t has been made an enum type (also required by POSIX) - nl_catd has been changed from long to void * - siginfo_t's struct tag has been removed - sigset_t's has been given a struct tag, __sigset_t - stack_t has been given a struct tag, sigaltstack - suseconds_t has been changed to long on 32-bit archs - [u]intptr_t have been changed from long to int rank on 32-bit archs - dev_t has been made unsigned summary of tests that have been performed against these changes: - nsz's libc-test (diff -u before and after) - C++ ABI check symbol dump (diff -u before, after, glibc) - grepped for __NEED, made sure types needed are still in alltypes - built gcc 3.4.6
92 lines
2.3 KiB
C
92 lines
2.3 KiB
C
#ifndef _STDIO_IMPL_H
|
|
#define _STDIO_IMPL_H
|
|
|
|
#include <stdio.h>
|
|
#include "syscall.h"
|
|
#include "libc.h"
|
|
|
|
#define UNGET 8
|
|
|
|
#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
|
|
#define F_NOWR 8
|
|
#define F_EOF 16
|
|
#define F_ERR 32
|
|
#define F_SVB 64
|
|
|
|
struct _IO_FILE {
|
|
unsigned flags;
|
|
unsigned char *rpos, *rend;
|
|
int (*close)(FILE *);
|
|
unsigned char *wend, *wpos;
|
|
unsigned char *mustbezero_1;
|
|
unsigned char *wbase;
|
|
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 lockcount;
|
|
short dummy3;
|
|
signed char mode;
|
|
signed char lbf;
|
|
int lock;
|
|
int waiters;
|
|
void *cookie;
|
|
off_t off;
|
|
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 *);
|
|
|
|
#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);
|
|
off_t __ftello(FILE *);
|
|
off_t __ftello_unlocked(FILE *);
|
|
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 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 *);
|
|
|
|
#endif
|