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.34 retrieving revision 1.52 diff -u -p -r1.34 -r1.52 --- src/include/stdio.h 2000/07/08 13:46:33 1.34 +++ src/include/stdio.h 2003/06/05 17:51:10 1.52 @@ -1,4 +1,4 @@ -/* $NetBSD: stdio.h,v 1.34 2000/07/08 13:46:33 kleink Exp $ */ +/* $NetBSD: stdio.h,v 1.52 2003/06/05 17:51:10 bjh21 Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -59,7 +59,7 @@ typedef _BSD_SIZE_T_ size_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__) +#if (!defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__)) || defined(_LIBC) typedef __off_t fpos_t; #else typedef struct __sfpos { @@ -123,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 */ @@ -155,8 +157,8 @@ __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 => fgetln modified _p text */ #define __SALC 0x4000 /* allocate string space dynamically */ @@ -187,11 +189,14 @@ __END_DECLS #define FILENAME_MAX 1024 /* must be <= PATH_MAX */ /* System V/ANSI C; this is the wrong way to do this, do *not* use these. */ -#ifndef _ANSI_SOURCE +#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) #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 @@ -218,42 +223,47 @@ 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 *, int, 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 *)); -size_t 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((FILE *)); -size_t fwrite __P((const void *, size_t, size_t, FILE *)); +size_t fwrite __P((const void * __restrict, size_t, size_t, + FILE * __restrict)); int getc __P((FILE *)); int getchar __P((void)); 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 *)); void rewind __P((FILE *)); -int scanf __P((const char *, ...)); -void setbuf __P((FILE *, char *)); -int setvbuf __P((FILE *, char *, int, size_t)); -int sscanf __P((const 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)); int ungetc __P((int, FILE *)); -int vfprintf __P((FILE *, const char *, _BSD_VA_LIST_)); -int vprintf __P((const char *, _BSD_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 *, const char *, ...)); +int sprintf __P((char * __restrict, const char * __restrict, ...)); char *tmpnam __P((char *)); -int vsprintf __P((char *, const char *, _BSD_VA_LIST_)); +int vsprintf __P((char * __restrict, const char * __restrict, + _BSD_VA_LIST_)); #endif #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) @@ -266,13 +276,18 @@ __END_DECLS /* * IEEE Std 1003.1-90 */ -#ifndef _ANSI_SOURCE +#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \ + defined(_NETBSD_SOURCE) #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 @@ -281,28 +296,24 @@ __END_DECLS /* * IEEE Std 1003.1c-95, also adopted by X/Open CAE Spec Issue 5 Version 2 */ -#if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ - !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 199506L || \ - (_XOPEN_SOURCE - 0) >= 500 || defined(_REENTRANT) +#if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \ + defined(_REENTRANT) || defined(_NETBSD_SOURCE) __BEGIN_DECLS -#if 0 /* not yet */ void flockfile __P((FILE *)); int ftrylockfile __P((FILE *)); void funlockfile __P((FILE *)); -#endif /* 0 */ 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) || ... */ +#endif /* _POSIX_C_SOURCE >= 1995056 || _XOPEN_SOURCE >= 500 || ... */ /* * 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 +#if (_POSIX_C_SOURCE - 0) >= 2 || (_XOPEN_SOURCE - 0) >= 2 || \ + defined(_NETBSD_SOURCE) __BEGIN_DECLS int pclose __P((FILE *)); FILE *popen __P((const char *, const char *)); @@ -312,14 +323,14 @@ __END_DECLS /* * Functions defined in XPG4.2. */ -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) || \ - defined(_XOPEN_SOURCE) +#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) __BEGIN_DECLS int getw __P((FILE *)); int putw __P((int, FILE *)); -int snprintf __P((char *, size_t, const char *, ...)) +int snprintf __P((char * __restrict, size_t, const char * __restrict, ...)) __attribute__((__format__(__printf__, 3, 4))); -int vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_)) +int vsnprintf __P((char * __restrict, size_t, const char * __restrict, + _BSD_VA_LIST_)) __attribute__((__format__(__printf__, 3, 0))); #ifndef __AUDIT__ @@ -331,45 +342,54 @@ __END_DECLS /* * X/Open CAE Specification Issue 5 Version 2 */ -#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \ - (_XOPEN_SOURCE - 0) >= 500 || defined(_LARGEFILE_SOURCE) +#if (_XOPEN_SOURCE - 0) >= 500 || defined(_LARGEFILE_SOURCE) || \ + defined(_NETBSD_SOURCE) #ifndef off_t typedef __off_t off_t; -#define off_t off_t -#endif 7* off_t */ +#define off_t __off_t +#endif /* off_t */ +__BEGIN_DECLS int fseeko __P((FILE *, off_t, int)); off_t ftello __P((FILE *)); -#endif /* (!_POSIX_SOURCE && !_XOPEN_SOURCE) || ... */ +__END_DECLS +#endif /* _XOPEN_SOURCE >= 500 || _LARGEFILE_SOURCE || _NETBSD_SOURCE */ /* * Routines that are purely local. */ -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ - !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_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 **, const char *, ...)) - __attribute__((__format__(__printf__, 2, 3))); -char *fgetln __P((FILE *, size_t *)); +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 **, const char *, _BSD_VA_LIST_)) - __attribute__((__format__(__printf__, 2, 0))); -int vscanf __P((const char *, _BSD_VA_LIST_)) +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 vsscanf __P((const char *, const char *, _BSD_VA_LIST_)) +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 /* - * 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. - */ -#define vfscanf __svfscanf - -/* * Stdio function-access interface. */ __BEGIN_DECLS @@ -381,14 +401,13 @@ FILE *funopen __P((const void *, __END_DECLS #define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0) #define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0) -#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */ +#endif /* _NETBSD_SOURCE */ /* * Functions internal to the implementation. */ __BEGIN_DECLS int __srget __P((FILE *)); -int __svfscanf __P((FILE *, const char *, _BSD_VA_LIST_)); int __swbuf __P((int, FILE *)); __END_DECLS @@ -424,33 +443,33 @@ static __inline int __sputc(int _c, FILE #define __sfileno(p) ((p)->_file) #ifndef lint -#ifndef _REENTRANT +#if !defined(_REENTRANT) && !defined(_PTHREADS) #define feof(p) __sfeof(p) #define ferror(p) __sferror(p) #define clearerr(p) __sclearerr(p) #define getc(fp) __sgetc(fp) #define putc(x, fp) __sputc(x, fp) -#endif /* !_REENTRANT */ +#endif /* !_REENTRANT && !_PTHREADS */ #endif /* lint */ #define getchar() getc(stdin) #define putchar(x) putc(x, stdout) -#ifndef _ANSI_SOURCE -#ifndef _REENTRANT +#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \ + defined(_NETBSD_SOURCE) +#if !defined(_REENTRANT) && !defined(_PTHREADS) #define fileno(p) __sfileno(p) -#endif /* !_REENTRANT */ +#endif /* !_REENTRANT && !_PTHREADS */ #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) +#if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \ + defined(_REENTRANT) || defined(_NETBSD_SOURCE) #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 /* _POSIX_C_SOURCE >= 199506 || _XOPEN_SOURCE >= 500 || _REENTRANT... */ #endif /* _STDIO_H_ */