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.24 retrieving revision 1.34 diff -u -p -r1.24 -r1.34 --- src/include/stdio.h 1998/07/27 09:58:49 1.24 +++ src/include/stdio.h 2000/07/08 13:46:33 1.34 @@ -1,4 +1,4 @@ -/* $NetBSD: stdio.h,v 1.24 1998/07/27 09:58:49 mycroft Exp $ */ +/* $NetBSD: stdio.h,v 1.34 2000/07/08 13:46:33 kleink Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -41,9 +41,7 @@ #ifndef _STDIO_H_ #define _STDIO_H_ -#if !defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__) -#include -#endif +#include #include #include @@ -54,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 @@ -64,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 @@ -163,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 @@ -248,7 +245,6 @@ void setbuf __P((FILE *, char *)); int setvbuf __P((FILE *, char *, int, size_t)); 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 *, _BSD_VA_LIST_)); int vprintf __P((const char *, _BSD_VA_LIST_)); @@ -256,6 +252,7 @@ int vprintf __P((const char *, _BSD_VA_ #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 @@ -267,7 +264,7 @@ int rename __P((const char *, const ch __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 */ @@ -281,21 +278,31 @@ int fileno __P((FILE *)); __END_DECLS #endif /* not ANSI */ -#if 1 /* _POSIX_C_SOURCE >= 199506L */ -extern void flockfile __P((FILE *)); -extern int ftrylockfile __P((FILE *)); -extern void funlockfile __P((FILE *)); -extern int getc_unlocked __P((FILE *)); -extern int getchar_unlocked __P((void)); -extern int putc_unlocked __P((int, FILE *)); -extern int putchar_unlocked __P((int)); -#endif +/* + * 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) +__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 XPGn or later. + * Functions defined in POSIX 1003.2 and XPG2 or later. */ -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) || \ - (_POSIX_C_SOURCE - 0) >= 2 || defined(_XOPEN_SOURCE) +#if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ + !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 2 || \ + (_XOPEN_SOURCE - 0) >= 2 __BEGIN_DECLS int pclose __P((FILE *)); FILE *popen __P((const char *, const char *)); @@ -311,9 +318,9 @@ __BEGIN_DECLS int getw __P((FILE *)); int putw __P((int, FILE *)); int snprintf __P((char *, size_t, const char *, ...)) - __attribute__((format (printf, 3, 4))); + __attribute__((__format__(__printf__, 3, 4))); int vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_)) - __attribute__((format (printf, 3, 0))); + __attribute__((__format__(__printf__, 3, 0))); #ifndef __AUDIT__ char *tempnam __P((const char *, const char *)); @@ -322,19 +329,37 @@ __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 *)); +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))); + __attribute__((__format__(__scanf__, 1, 0))); int vsscanf __P((const char *, const char *, _BSD_VA_LIST_)) - __attribute__((format (scanf, 2, 0))); + __attribute__((__format__(__scanf__, 2, 0))); __END_DECLS /* @@ -406,20 +431,26 @@ static __inline int __sputc(int _c, FILE #define getc(fp) __sgetc(fp) #define putc(x, fp) __sputc(x, fp) -#endif /* _REENTRANT */ +#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 */ +#endif /* (!_ANSI_SOURCE && !_POSIX_C_SOURCE && !_XOPEN_SOURCE) || ... */ #endif /* _STDIO_H_ */