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.58.2.3
retrieving revision 1.73
diff -u -p -r1.58.2.3 -r1.73
--- src/include/stdio.h	2005/05/28 13:51:31	1.58.2.3
+++ src/include/stdio.h	2008/09/21 16:59:46	1.73
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.58.2.3 2005/05/28 13:51:31 tron Exp $	*/
+/*	$NetBSD: stdio.h,v 1.73 2008/09/21 16:59:46 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -106,7 +106,7 @@ typedef	struct __sFILE {
 	unsigned char *_p;	/* current position in (some) buffer */
 	int	_r;		/* read space left for getc() */
 	int	_w;		/* write space left for putc() */
-	short	_flags;		/* flags, below; this FILE is free if 0 */
+	unsigned short _flags;	/* flags, below; this FILE is free if 0 */
 	short	_file;		/* fileno, if Unix descriptor, else -1 */
 	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
 	int	_lbfsize;	/* 0 or -_bf._size, for inline putc */
@@ -221,13 +221,15 @@ 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, ...);
+int	 fprintf(FILE * __restrict , const char * __restrict, ...)
+    __attribute__((__format__(__printf__, 2, 3)));
 int	 fputc(int, FILE *);
 int	 fputs(const char * __restrict, FILE * __restrict);
 size_t	 fread(void * __restrict, size_t, size_t, FILE * __restrict);
 FILE	*freopen(const char * __restrict, const char * __restrict,
 	    FILE * __restrict);
-int	 fscanf(FILE * __restrict, const char * __restrict, ...);
+int	 fscanf(FILE * __restrict, const char * __restrict, ...)
+    __attribute__((__format__(__scanf__, 2, 3)));
 int	 fseek(FILE *, long, int);
 int	 fsetpos(FILE *, const fpos_t *);
 long	 ftell(FILE *);
@@ -235,27 +237,34 @@ size_t	 fwrite(const void * __restrict, 
 int	 getc(FILE *);
 int	 getchar(void);
 void	 perror(const char *);
-int	 printf(const char * __restrict, ...);
+int	 printf(const char * __restrict, ...)
+    __attribute__((__format__(__printf__, 1, 2)));
 int	 putc(int, FILE *);
 int	 putchar(int);
 int	 puts(const char *);
 int	 remove(const char *);
 void	 rewind(FILE *);
-int	 scanf(const char * __restrict, ...);
+int	 scanf(const char * __restrict, ...)
+    __attribute__((__format__(__scanf__, 1, 2)));
 void	 setbuf(FILE * __restrict, char * __restrict);
 int	 setvbuf(FILE * __restrict, char * __restrict, int, size_t);
-int	 sscanf(const char * __restrict, const char * __restrict, ...);
+int	 sscanf(const char * __restrict, const char * __restrict, ...)
+    __attribute__((__format__(__scanf__, 2, 3)));
 FILE	*tmpfile(void);
 int	 ungetc(int, FILE *);
-int	 vfprintf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_);
-int	 vprintf(const char * __restrict, _BSD_VA_LIST_);
+int	 vfprintf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_)
+    __attribute__((__format__(__printf__, 2, 0)));
+int	 vprintf(const char * __restrict, _BSD_VA_LIST_)
+    __attribute__((__format__(__printf__, 1, 0)));
 
 #ifndef __AUDIT__
 char	*gets(char *);
-int	 sprintf(char * __restrict, const char * __restrict, ...);
+int	 sprintf(char * __restrict, const char * __restrict, ...)
+    __attribute__((__format__(__printf__, 2, 3)));
 char	*tmpnam(char *);
 int	 vsprintf(char * __restrict, const char * __restrict,
-	    _BSD_VA_LIST_);
+    _BSD_VA_LIST_)
+    __attribute__((__format__(__printf__, 2, 0)));
 #endif
 
 #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)
@@ -315,18 +324,18 @@ __END_DECLS
 /*
  * Functions defined in ISO XPG4.2, ISO C99, POSIX 1003.1-2001 or later.
  */
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || \
-    ((__STDC_VERSION__ - 0) >= 199901L) || \
+#if ((__STDC_VERSION__ - 0) >= 199901L) || \
     ((_POSIX_C_SOURCE - 0) >= 200112L) || \
     (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \
     ((_XOPEN_SOURCE - 0) >= 500) || \
     defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
+__BEGIN_DECLS
 int	 snprintf(char * __restrict, size_t, const char * __restrict, ...)
-	    __attribute__((__format__(__printf__, 3, 4)));
+    __attribute__((__format__(__printf__, 3, 4)));
 int	 vsnprintf(char * __restrict, size_t, const char * __restrict,
 	    _BSD_VA_LIST_)
-	    __attribute__((__format__(__printf__, 3, 0)));
+    __attribute__((__format__(__printf__, 3, 0)));
+__END_DECLS
 #endif
 
 /*
@@ -360,6 +369,22 @@ __END_DECLS
 #endif /* _XOPEN_SOURCE >= 500 || _LARGEFILE_SOURCE || _NETBSD_SOURCE */
 
 /*
+ * Functions defined in ISO C99.  Still put under _NETBSD_SOURCE due to
+ * backward compatible.
+ */
+#if defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
+__BEGIN_DECLS
+int	 vscanf(const char * __restrict, _BSD_VA_LIST_)
+    __attribute__((__format__(__scanf__, 1, 0)));
+int	 vfscanf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_)
+    __attribute__((__format__(__scanf__, 2, 0)));
+int	 vsscanf(const char * __restrict, const char * __restrict,
+    _BSD_VA_LIST_)
+    __attribute__((__format__(__scanf__, 2, 0)));
+__END_DECLS
+#endif /* _ISOC99_SOURCE || _NETBSD_SOURCE */
+
+/*
  * Routines that are purely local.
  */
 #if defined(_NETBSD_SOURCE)
@@ -372,25 +397,17 @@ __END_DECLS
 
 __BEGIN_DECLS
 int	 asprintf(char ** __restrict, const char * __restrict, ...)
-	    __attribute__((__format__(__printf__, 2, 3)));
+    __attribute__((__format__(__printf__, 2, 3)));
 char	*fgetln(FILE * __restrict, size_t * __restrict);
 char	*fparseln(FILE *, size_t *, size_t *, const char[3], int);
 int	 fpurge(FILE *);
 void	 setbuffer(FILE *, char *, int);
 int	 setlinebuf(FILE *);
 int	 vasprintf(char ** __restrict, const char * __restrict,
-	    _BSD_VA_LIST_)
-	    __attribute__((__format__(__printf__, 2, 0)));
-int	 vscanf(const char * __restrict, _BSD_VA_LIST_)
-	    __attribute__((__format__(__scanf__, 1, 0)));
-int	 vfscanf(FILE * __restrict, const char * __restrict,
-	    _BSD_VA_LIST_)
-	    __attribute__((__format__(__scanf__, 2, 0)));
-int	 vsscanf(const char * __restrict, const char * __restrict,
-	    _BSD_VA_LIST_)
-	    __attribute__((__format__(__scanf__, 2, 0)));
-__const char *fmtcheck(const char *, const char *)
-	    __attribute__((__format_arg__(2)));
+    _BSD_VA_LIST_)
+    __attribute__((__format__(__printf__, 2, 0)));
+const char *fmtcheck(const char *, const char *)
+    __attribute__((__format_arg__(2)));
 __END_DECLS
 
 /*
@@ -444,7 +461,8 @@ static __inline int __sputc(int _c, FILE
 #define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
 #define	__sferror(p)	(((p)->_flags & __SERR) != 0)
 #define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
-#define	__sfileno(p)	((p)->_file)
+#define	__sfileno(p)	\
+    ((p)->_file == -1 ? -1 : (int)(unsigned short)(p)->_file)
 
 #ifndef __lint__
 #if !defined(_REENTRANT) && !defined(_PTHREADS)
@@ -476,4 +494,8 @@ static __inline int __sputc(int _c, FILE
 #define putchar_unlocked(x)	putc_unlocked(x, stdout)
 #endif /* _POSIX_C_SOURCE >= 199506 || _XOPEN_SOURCE >= 500 || _REENTRANT... */
 
+#if _FORTIFY_SOURCE > 0
+#include <ssp/stdio.h>
+#endif
+
 #endif /* _STDIO_H_ */