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.12 retrieving revision 1.34 diff -u -p -r1.12 -r1.34 --- src/include/stdio.h 1994/05/21 09:42:20 1.12 +++ src/include/stdio.h 2000/07/08 13:46:33 1.34 @@ -1,6 +1,8 @@ +/* $NetBSD: stdio.h,v 1.34 2000/07/08 13:46:33 kleink 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,18 +35,16 @@ * 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.12 1994/05/21 09:42:20 cgd Exp $ + * @(#)stdio.h 8.5 (Berkeley) 4/29/95 */ #ifndef _STDIO_H_ #define _STDIO_H_ -#if !defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI_) -#include -#endif +#include #include +#include #include #ifdef _BSD_SIZE_T_ @@ -52,9 +52,7 @@ typedef _BSD_SIZE_T_ size_t; #undef _BSD_SIZE_T_ #endif -#ifndef NULL -#define NULL 0 -#endif +#include /* * This is fairly grotesque, but pure ANSI code must not inspect the @@ -62,10 +60,10 @@ typedef _BSD_SIZE_T_ size_t; * which we assume is exactly as big as eight chars. */ #if !defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__) -typedef off_t fpos_t; +typedef __off_t fpos_t; #else typedef struct __sfpos { - long long _pos; /* XXX must be the same as off_t */ + __off_t _pos; } fpos_t; #endif @@ -106,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 */ @@ -159,6 +159,7 @@ __END_DECLS #define __SNPT 0x0800 /* do not do fseek() optimisation */ #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 */ /* * The following three definitions are for ANSI C, which took them @@ -177,10 +178,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 */ @@ -191,6 +193,7 @@ __END_DECLS #define L_tmpnam 1024 /* XXX must be == PATH_MAX */ #define TMP_MAX 308915776 +/* Always ensure that these are consistent with and ! */ #ifndef SEEK_SET #define SEEK_SET 0 /* set file offset to offset */ #endif @@ -216,7 +219,7 @@ 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 *)); +char *fgets __P((char *, int, FILE *)); FILE *fopen __P((const char *, const char *)); int fprintf __P((FILE *, const char *, ...)); int fputc __P((int, FILE *)); @@ -226,38 +229,42 @@ FILE *freopen __P((const char *, const c int fscanf __P((FILE *, const char *, ...)); int fseek __P((FILE *, long, int)); int fsetpos __P((FILE *, const fpos_t *)); -long ftell __P((const FILE *)); +long ftell __P((FILE *)); size_t fwrite __P((const void *, size_t, size_t, FILE *)); 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 const char *const sys_errlist[]; -#endif void perror __P((const char *)); int printf __P((const char *, ...)); 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((const char *, const char *, ...)); 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 *, const char *, _BSD_VA_LIST_)); +int vprintf __P((const char *, _BSD_VA_LIST_)); + +#ifndef __AUDIT__ +char *gets __P((char *)); +int sprintf __P((char *, const char *, ...)); +char *tmpnam __P((char *)); +int vsprintf __P((char *, const char *, _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_ctermid 1024 /* size for ctermid(); PATH_MAX */ @@ -272,27 +279,87 @@ __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 +#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) || ... */ + +/* + * 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 *fgetln __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 *)); +int snprintf __P((char *, size_t, const char *, ...)) + __attribute__((__format__(__printf__, 3, 4))); +int vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_)) + __attribute__((__format__(__printf__, 3, 0))); + +#ifndef __AUDIT__ +char *tempnam __P((const char *, const char *)); +#endif +__END_DECLS +#endif + +/* + * X/Open CAE Specification Issue 5 Version 2 + */ +#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 7* off_t */ + +int fseeko __P((FILE *, off_t, int)); +off_t ftello __P((FILE *)); +#endif /* (!_POSIX_SOURCE && !_XOPEN_SOURCE) || ... */ + +/* + * Routines that are purely local. + */ +#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ + !defined(_XOPEN_SOURCE) +__BEGIN_DECLS +int asprintf __P((char **, const char *, ...)) + __attribute__((__format__(__printf__, 2, 3))); +char *fgetln __P((FILE *, size_t *)); +int fpurge __P((FILE *)); void setbuffer __P((FILE *, char *, int)); int setlinebuf __P((FILE *)); -char *tempnam __P((const char *, const char *)); -int snprintf __P((char *, size_t, const char *, ...)) - __attribute__((format (printf, 3, 4))); -int vsnprintf __P((char *, size_t, const char *, _VA_LIST_)) - __attribute__((format (printf, 3, 0))); -int vscanf __P((const char *, _VA_LIST_)) - __attribute__((format (scanf, 1, 0))); -int vsscanf __P((const char *, const char *, _VA_LIST_)) - __attribute__((format (scanf, 2, 0))); +int vasprintf __P((char **, const char *, _BSD_VA_LIST_)) + __attribute__((__format__(__printf__, 2, 0))); +int vscanf __P((const char *, _BSD_VA_LIST_)) + __attribute__((__format__(__scanf__, 1, 0))); +int vsscanf __P((const char *, const char *, _BSD_VA_LIST_)) + __attribute__((__format__(__scanf__, 2, 0))); __END_DECLS /* @@ -321,7 +388,7 @@ __END_DECLS */ __BEGIN_DECLS int __srget __P((FILE *)); -int __svfscanf __P((FILE *, const char *, _VA_LIST_)); +int __svfscanf __P((FILE *, const char *, _BSD_VA_LIST_)); int __swbuf __P((int, FILE *)); __END_DECLS @@ -356,19 +423,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_ */