Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/include/stdio.h,v rcsdiff: /ftp/cvs/cvsroot/src/include/stdio.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.77 retrieving revision 1.79.2.2 diff -u -p -r1.77 -r1.79.2.2 --- src/include/stdio.h 2010/09/06 14:52:26 1.77 +++ src/include/stdio.h 2012/05/23 10:07:30 1.79.2.2 @@ -1,4 +1,4 @@ -/* $NetBSD: stdio.h,v 1.77 2010/09/06 14:52:26 christos Exp $ */ +/* $NetBSD: stdio.h,v 1.79.2.2 2012/05/23 10:07:30 yamt Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -41,7 +41,6 @@ #include #include -#include #ifdef _BSD_SIZE_T_ typedef _BSD_SIZE_T_ size_t; #undef _BSD_SIZE_T_ @@ -51,6 +50,13 @@ typedef _BSD_SSIZE_T_ ssize_t; #undef _BSD_SSIZE_T_ #endif +#if defined(_POSIX_C_SOURCE) +#ifndef __VA_LIST_DECLARED +typedef __va_list va_list; +#define __VA_LIST_DECLARED +#endif +#endif + #include /* @@ -58,13 +64,10 @@ typedef _BSD_SSIZE_T_ ssize_t; * innards of an fpos_t anyway. The library internally uses off_t, * which we assume is exactly as big as eight chars. */ -#if (!defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__)) || defined(_LIBC) -typedef __off_t fpos_t; -#else typedef struct __sfpos { __off_t _pos; + __mbstate_t _mbstate_in, _mbstate_out; } fpos_t; -#endif #define _FSTDIO /* Define for new stdio with functions. */ @@ -118,9 +121,9 @@ typedef struct __sFILE { /* operations */ void *_cookie; /* cookie passed to io functions */ int (*_close)(void *); - int (*_read) (void *, char *, int); - fpos_t (*_seek) (void *, fpos_t, int); - int (*_write)(void *, const char *, int); + ssize_t (*_read) (void *, void *, size_t); + __off_t (*_seek) (void *, __off_t, int); + ssize_t (*_write)(void *, const void *, size_t); /* file extension */ struct __sbuf _ext; @@ -133,16 +136,17 @@ typedef struct __sFILE { unsigned char _ubuf[3]; /* guarantee an ungetc() buffer */ unsigned char _nbuf[1]; /* guarantee a getc() buffer */ + int (*_flush)(void *); /* Formerly used by fgetln/fgetwln; kept for binary compatibility */ - struct __sbuf _lb__unused; + char _lb_unused[sizeof(struct __sbuf) - sizeof(int (*)(void *))]; /* Unix stdio files get aligned to block boundaries on fseek() */ int _blksize; /* stat.st_blksize (may be != _bf._size) */ - fpos_t _offset; /* current lseek offset */ + __off_t _offset; /* current lseek offset */ } FILE; __BEGIN_DECLS -extern FILE __sF[]; +extern FILE __sF[3]; __END_DECLS #define __SLBF 0x0001 /* line buffered */ @@ -222,7 +226,6 @@ int feof(FILE *); int ferror(FILE *); int fflush(FILE *); int fgetc(FILE *); -int fgetpos(FILE * __restrict, fpos_t * __restrict); char *fgets(char * __restrict, int, FILE * __restrict); FILE *fopen(const char * __restrict , const char * __restrict); int fprintf(FILE * __restrict , const char * __restrict, ...) @@ -235,7 +238,6 @@ FILE *freopen(const char * __restrict, c int fscanf(FILE * __restrict, const char * __restrict, ...) __scanflike(2, 3); int fseek(FILE *, long, int); -int fsetpos(FILE *, const fpos_t *); long ftell(FILE *); size_t fwrite(const void * __restrict, size_t, size_t, FILE * __restrict); int getc(FILE *); @@ -259,9 +261,9 @@ int sscanf(const char * __restrict, con __scanflike(2, 3); FILE *tmpfile(void); int ungetc(int, FILE *); -int vfprintf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_) +int vfprintf(FILE * __restrict, const char * __restrict, __va_list) __printflike(2, 0); -int vprintf(const char * __restrict, _BSD_VA_LIST_) +int vprintf(const char * __restrict, __va_list) __printflike(1, 0); #ifndef __AUDIT__ @@ -270,7 +272,7 @@ int sprintf(char * __restrict, const ch __printflike(2, 3); char *tmpnam(char *); int vsprintf(char * __restrict, const char * __restrict, - _BSD_VA_LIST_) + __va_list) __printflike(2, 0); #endif @@ -281,6 +283,10 @@ int rename (const char *, const char *) #endif __END_DECLS +#ifndef __LIBC12_SOURCE__ +int fgetpos(FILE * __restrict, fpos_t * __restrict) __RENAME(__fgetpos50); +int fsetpos(FILE *, const fpos_t *) __RENAME(__fsetpos50); +#endif /* * IEEE Std 1003.1-90 */ @@ -340,7 +346,7 @@ __BEGIN_DECLS int snprintf(char * __restrict, size_t, const char * __restrict, ...) __printflike(3, 4); int vsnprintf(char * __restrict, size_t, const char * __restrict, - _BSD_VA_LIST_) + __va_list) __printflike(3, 0); __END_DECLS #endif @@ -381,12 +387,12 @@ __END_DECLS */ #if defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE) __BEGIN_DECLS -int vscanf(const char * __restrict, _BSD_VA_LIST_) +int vscanf(const char * __restrict, __va_list) __scanflike(1, 0); -int vfscanf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_) +int vfscanf(FILE * __restrict, const char * __restrict, __va_list) __scanflike(2, 0); int vsscanf(const char * __restrict, const char * __restrict, - _BSD_VA_LIST_) + __va_list) __scanflike(2, 0); __END_DECLS #endif /* _ISOC99_SOURCE || _NETBSD_SOURCE */ @@ -411,7 +417,7 @@ int fpurge(FILE *); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); int vasprintf(char ** __restrict, const char * __restrict, - _BSD_VA_LIST_) + __va_list) __printflike(2, 0); const char *fmtcheck(const char *, const char *) __format_arg(2); @@ -422,13 +428,21 @@ __END_DECLS */ __BEGIN_DECLS FILE *funopen(const void *, - int (*)(void *, char *, int), - int (*)(void *, const char *, int), - fpos_t (*)(void *, fpos_t, int), - int (*)(void *)); + int (*)(void *, char *, int), + int (*)(void *, const char *, int), + off_t (*)(void *, off_t, int), + int (*)(void *)); +FILE *funopen2(const void *, + ssize_t (*)(void *, void *, size_t), + ssize_t (*)(void *, const void *, size_t), + off_t (*)(void *, off_t, int), + int (*)(void *), + int (*)(void *)); __END_DECLS #define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0) #define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0) +#define fropen2(cookie, fn) funopen2(cookie, fn, 0, 0, 0, 0) +#define fwopen2(cookie, fn) funopen2(cookie, 0, fn, 0, 0, 0) #endif /* _NETBSD_SOURCE */ /* @@ -493,7 +507,7 @@ static __inline int __sputc(int _c, FILE #endif /* !_ANSI_SOURCE */ #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE) -int vdprintf(int, const char * __restrict, _BSD_VA_LIST_) +int vdprintf(int, const char * __restrict, __va_list) __printflike(2, 0); int dprintf(int, const char * __restrict, ...) __printflike(2, 3); @@ -508,6 +522,11 @@ int dprintf(int, const char * __restric #define putchar_unlocked(x) putc_unlocked(x, stdout) #endif /* _POSIX_C_SOURCE >= 199506 || _XOPEN_SOURCE >= 500 || _REENTRANT... */ +#if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \ + defined(_NETBSD_SOURCE) +FILE *fmemopen(void * __restrict, size_t, const char * __restrict); +#endif + #if _FORTIFY_SOURCE > 0 #include #endif