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.3 retrieving revision 1.49 diff -u -p -r1.3 -r1.49 --- src/include/stdio.h 1993/08/01 18:45:17 1.3 +++ src/include/stdio.h 2003/01/18 17:10:17 1.49 @@ -1,6 +1,8 @@ +/* $NetBSD: stdio.h,v 1.49 2003/01/18 17:10:17 christos Exp $ */ + /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Chris Torek. @@ -33,26 +35,37 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)stdio.h 5.17 (Berkeley) 6/3/91 - * $Id: stdio.h,v 1.3 1993/08/01 18:45:17 mycroft Exp $ + * @(#)stdio.h 8.5 (Berkeley) 4/29/95 */ #ifndef _STDIO_H_ #define _STDIO_H_ +#include + #include +#include #include -#ifdef _SIZE_T_ -typedef _SIZE_T_ size_t; -#undef _SIZE_T_ +#ifdef _BSD_SIZE_T_ +typedef _BSD_SIZE_T_ size_t; +#undef _BSD_SIZE_T_ #endif -#ifndef NULL -#define NULL 0 -#endif +#include -typedef long fpos_t; /* Must match off_t */ +/* + * This is fairly grotesque, but pure ANSI code must not inspect the + * 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; +} fpos_t; +#endif #define _FSTDIO /* Define for new stdio with functions. */ @@ -91,6 +104,8 @@ struct __sbuf { * that does not match the previous one in _bf. When this happens, * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff * _ub._base!=NULL) and _up and _ur save the current values of _p and _r. + * + * NB: see WARNING above before changing the layout of this structure! */ typedef struct __sFILE { unsigned char *_p; /* current position in (some) buffer */ @@ -108,8 +123,10 @@ typedef struct __sFILE { fpos_t (*_seek) __P((void *, fpos_t, int)); int (*_write) __P((void *, const char *, int)); + /* file extension */ + struct __sbuf _ext; + /* separate buffer for long sequences of ungetc() */ - struct __sbuf _ub; /* ungetc buffer */ unsigned char *_up; /* saved _p when _p is doing ungetc data */ int _ur; /* saved _r when _r is counting ungetc data */ @@ -117,12 +134,12 @@ typedef struct __sFILE { unsigned char _ubuf[3]; /* guarantee an ungetc() buffer */ unsigned char _nbuf[1]; /* guarantee a getc() buffer */ - /* separate buffer for fgetline() when line crosses buffer boundary */ - struct __sbuf _lb; /* buffer for fgetline() */ + /* separate buffer for fgetln() when line crosses buffer boundary */ + struct __sbuf _lb; /* buffer for fgetln() */ /* Unix stdio files get aligned to block boundaries on fseek() */ int _blksize; /* stat.st_blksize (may be != _bf._size) */ - int _offset; /* current lseek offset */ + fpos_t _offset; /* current lseek offset */ } FILE; __BEGIN_DECLS @@ -140,10 +157,11 @@ __END_DECLS #define __SMBF 0x0080 /* _buf is from malloc */ #define __SAPP 0x0100 /* fdopen()ed in append mode */ #define __SSTR 0x0200 /* this is an sprintf/snprintf string */ -#define __SOPT 0x0400 /* do fseek() optimisation */ -#define __SNPT 0x0800 /* do not do fseek() optimisation */ +#define __SOPT 0x0400 /* do fseek() optimization */ +#define __SNPT 0x0800 /* do not do fseek() optimization */ #define __SOFF 0x1000 /* set iff _offset is in fact correct */ -#define __SMOD 0x2000 /* true => fgetline modified _p text */ +#define __SMOD 0x2000 /* true => fgetln modified _p text */ +#define __SALC 0x4000 /* allocate string space dynamically */ /* * The following three definitions are for ANSI C, which took them @@ -162,10 +180,11 @@ __END_DECLS #define EOF (-1) /* - * FOPEN_MAX is a minimum maximum, and should be the number of descriptors - * that the kernel can provide without allocation of a resource that can - * fail without the process sleeping. Do not use this for anything. + * FOPEN_MAX is a minimum maximum, and is the number of streams that + * stdio can provide without attempting to allocate further resources + * (which could fail). Do not use this for anything. */ + /* must be == _POSIX_STREAM_MAX */ #define FOPEN_MAX 20 /* must be <= OPEN_MAX */ #define FILENAME_MAX 1024 /* must be <= PATH_MAX */ @@ -174,8 +193,12 @@ __END_DECLS #define P_tmpdir "/var/tmp/" #endif #define L_tmpnam 1024 /* XXX must be == PATH_MAX */ -#define TMP_MAX 308915776 +/* Always ensure that this is consistent with */ +#ifndef TMP_MAX +#define TMP_MAX 308915776 /* Legacy */ +#endif +/* Always ensure that these are consistent with and ! */ #ifndef SEEK_SET #define SEEK_SET 0 /* set file offset to offset */ #endif @@ -200,87 +223,174 @@ int feof __P((FILE *)); int ferror __P((FILE *)); int fflush __P((FILE *)); int fgetc __P((FILE *)); -int fgetpos __P((FILE *, fpos_t *)); -char *fgets __P((char *, size_t, FILE *)); +int fgetpos __P((FILE * __restrict, fpos_t * __restrict)); +char *fgets __P((char * __restrict, int, FILE * __restrict)); FILE *fopen __P((const char *, const char *)); -int fprintf __P((FILE *, const char *, ...)); +int fprintf __P((FILE * __restrict , const char * __restrict, ...)); int fputc __P((int, FILE *)); -int fputs __P((const char *, FILE *)); -int fread __P((void *, size_t, size_t, FILE *)); -FILE *freopen __P((const char *, const char *, FILE *)); -int fscanf __P((FILE *, const char *, ...)); +int fputs __P((const char * __restrict, FILE * __restrict)); +size_t fread __P((void * __restrict, size_t, size_t, FILE * __restrict)); +FILE *freopen __P((const char *, const char *, FILE * __restrict)); +int fscanf __P((FILE * __restrict, const char * __restrict, ...)); int fseek __P((FILE *, long, int)); int fsetpos __P((FILE *, const fpos_t *)); -long ftell __P((const FILE *)); -int fwrite __P((const void *, size_t, size_t, FILE *)); +long ftell __P((FILE *)); +size_t fwrite __P((const void * __restrict, size_t, size_t, + FILE * __restrict)); int getc __P((FILE *)); int getchar __P((void)); -char *gets __P((char *)); -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -extern int sys_nerr; /* perror(3) external variables */ -extern char *sys_errlist[]; -#endif void perror __P((const char *)); -int printf __P((const char *, ...)); +int printf __P((const char * __restrict, ...)); int putc __P((int, FILE *)); int putchar __P((int)); int puts __P((const char *)); int remove __P((const char *)); -int rename __P((const char *, const char *)); void rewind __P((FILE *)); -int scanf __P((const char *, ...)); -void setbuf __P((FILE *, char *)); -int setvbuf __P((FILE *, char *, int, size_t)); -int sprintf __P((char *, const char *, ...)); -int sscanf __P((char *, const char *, ...)); +int scanf __P((const char * __restrict, ...)); +void setbuf __P((FILE * __restrict, char * __restrict)); +int setvbuf __P((FILE * __restrict, char * __restrict, int, size_t)); +int sscanf __P((const char * __restrict, const char * __restrict, ...)); FILE *tmpfile __P((void)); -char *tmpnam __P((char *)); int ungetc __P((int, FILE *)); -int vfprintf __P((FILE *, const char *, _VA_LIST_)); -int vprintf __P((const char *, _VA_LIST_)); -int vsprintf __P((char *, const char *, _VA_LIST_)); +int vfprintf __P((FILE * __restrict, const char * __restrict, + _BSD_VA_LIST_)); +int vfprintf_unlocked __P((FILE * __restrict, const char * __restrict, + _BSD_VA_LIST_)); +int vprintf __P((const char * __restrict, _BSD_VA_LIST_)); + +#ifndef __AUDIT__ +char *gets __P((char *)); +int sprintf __P((char * __restrict, const char * __restrict, ...)); +char *tmpnam __P((char *)); +int vsprintf __P((char * __restrict, const char * __restrict, + _BSD_VA_LIST_)); +#endif + +#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) +int rename __P((const char *, const char *)) __RENAME(__posix_rename); +#else +int rename __P((const char *, const char *)); +#endif __END_DECLS /* - * Functions defined in POSIX 1003.1. + * IEEE Std 1003.1-90 */ #ifndef _ANSI_SOURCE -#define L_cuserid 9 /* size for cuserid(); UT_NAMESIZE + 1 */ #define L_ctermid 1024 /* size for ctermid(); PATH_MAX */ +#define L_cuserid 9 /* size for cuserid(); UT_NAMESIZE + 1 */ __BEGIN_DECLS char *ctermid __P((char *)); +#ifndef __CUSERID_DECLARED +#define __CUSERID_DECLARED +/* also declared in unistd.h */ +char *cuserid __P((char *)); +#endif /* __CUSERID_DECLARED */ FILE *fdopen __P((int, const char *)); int fileno __P((FILE *)); __END_DECLS #endif /* not ANSI */ /* - * Routines that are purely local. + * IEEE Std 1003.1c-95, also adopted by X/Open CAE Spec Issue 5 Version 2 */ -#if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ + !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 199506L || \ + (_XOPEN_SOURCE - 0) >= 500 || defined(_REENTRANT) +__BEGIN_DECLS +void flockfile __P((FILE *)); +int ftrylockfile __P((FILE *)); +void funlockfile __P((FILE *)); +int getc_unlocked __P((FILE *)); +int getchar_unlocked __P((void)); +int putc_unlocked __P((int, FILE *)); +int putchar_unlocked __P((int)); +__END_DECLS +#endif /* (!_ANSI_SOURCE && !_POSIX_C_SOURCE && !_XOPEN_SOURCE) || ... */ + +/* + * Functions defined in POSIX 1003.2 and XPG2 or later. + */ +#if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ + !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 2 || \ + (_XOPEN_SOURCE - 0) >= 2 __BEGIN_DECLS -char *fgetline __P((FILE *, size_t *)); -int fpurge __P((FILE *)); -int getw __P((FILE *)); int pclose __P((FILE *)); FILE *popen __P((const char *, const char *)); +__END_DECLS +#endif + +/* + * Functions defined in XPG4.2. + */ +#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) || \ + defined(_XOPEN_SOURCE) +__BEGIN_DECLS +int getw __P((FILE *)); int putw __P((int, FILE *)); -void setbuffer __P((FILE *, char *, int)); -int setlinebuf __P((FILE *)); +int snprintf __P((char * __restrict, size_t, const char * __restrict, ...)) + __attribute__((__format__(__printf__, 3, 4))); +int vsnprintf __P((char * __restrict, size_t, const char * __restrict, + _BSD_VA_LIST_)) + __attribute__((__format__(__printf__, 3, 0))); + +#ifndef __AUDIT__ char *tempnam __P((const char *, const char *)); -int snprintf __P((char *, size_t, const char *, ...)); -int vsnprintf __P((char *, size_t, const char *, _VA_LIST_)); -int vscanf __P((const char *, _VA_LIST_)); -int vsscanf __P((const char *, const char *, _VA_LIST_)); +#endif __END_DECLS +#endif /* - * This is a #define because the function is used internally and - * (unlike vfscanf) the name __svfscanf is guaranteed not to collide - * with a user function when _ANSI_SOURCE or _POSIX_SOURCE is defined. + * X/Open CAE Specification Issue 5 Version 2 */ -#define vfscanf __svfscanf +#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \ + (_XOPEN_SOURCE - 0) >= 500 || defined(_LARGEFILE_SOURCE) +#ifndef off_t +typedef __off_t off_t; +#define off_t __off_t +#endif /* off_t */ + +__BEGIN_DECLS +int fseeko __P((FILE *, off_t, int)); +off_t ftello __P((FILE *)); +__END_DECLS +#endif /* (!_POSIX_SOURCE && !_XOPEN_SOURCE) || ... */ + +/* + * Routines that are purely local. + */ +#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ + !defined(_XOPEN_SOURCE) + +#define FPARSELN_UNESCESC 0x01 +#define FPARSELN_UNESCCONT 0x02 +#define FPARSELN_UNESCCOMM 0x04 +#define FPARSELN_UNESCREST 0x08 +#define FPARSELN_UNESCALL 0x0f + +__BEGIN_DECLS +int asprintf __P((char ** __restrict, const char * __restrict, ...)) + __attribute__((__format__(__printf__, 2, 3))); +char *fgetln __P((FILE * __restrict, size_t * __restrict)); +char *fparseln(FILE *, size_t *, size_t *, const char[3], int); +int fpurge __P((FILE *)); +void setbuffer __P((FILE *, char *, int)); +int setlinebuf __P((FILE *)); +int vasprintf __P((char ** __restrict, const char * __restrict, + _BSD_VA_LIST_)) + __attribute__((__format__(__printf__, 2, 0))); +int vscanf __P((const char * __restrict, _BSD_VA_LIST_)) + __attribute__((__format__(__scanf__, 1, 0))); +int vfscanf __P((FILE * __restrict, const char * __restrict, + _BSD_VA_LIST_)) + __attribute__((__format__(__scanf__, 2, 0))); +int vsscanf __P((const char * __restrict, const char * __restrict, + _BSD_VA_LIST_)) + __attribute__((__format__(__scanf__, 2, 0))); +__const char *fmtcheck __P((const char *, const char *)) + __attribute__((__format_arg__(2))); +__END_DECLS /* * Stdio function-access interface. @@ -301,7 +411,6 @@ __END_DECLS */ __BEGIN_DECLS int __srget __P((FILE *)); -int __svfscanf __P((FILE *, const char *, _VA_LIST_)); int __swbuf __P((int, FILE *)); __END_DECLS @@ -336,19 +445,34 @@ static __inline int __sputc(int _c, FILE #define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF))) #define __sfileno(p) ((p)->_file) +#ifndef lint +#ifndef _REENTRANT #define feof(p) __sfeof(p) #define ferror(p) __sferror(p) #define clearerr(p) __sclearerr(p) -#ifndef _ANSI_SOURCE -#define fileno(p) __sfileno(p) -#endif - -#ifndef lint #define getc(fp) __sgetc(fp) #define putc(x, fp) __sputc(x, fp) +#endif /* !_REENTRANT */ #endif /* lint */ #define getchar() getc(stdin) #define putchar(x) putc(x, stdout) + +#ifndef _ANSI_SOURCE +#ifndef _REENTRANT +#define fileno(p) __sfileno(p) +#endif /* !_REENTRANT */ +#endif /* !_ANSI_SOURCE */ + +#if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ + !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 199506L || \ + (_XOPEN_SOURCE - 0) >= 500 || defined(_REENTRANT) +#define getc_unlocked(fp) __sgetc(fp) +#define putc_unlocked(x, fp) __sputc(x, fp) + +#define getchar_unlocked() getc_unlocked(stdin) +#define putchar_unlocked(x) putc_unlocked(x, stdout) +#endif /* (!_ANSI_SOURCE && !_POSIX_C_SOURCE && !_XOPEN_SOURCE) || ... */ + #endif /* _STDIO_H_ */