[BACK]Return to stdio.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / include

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/include/stdio.h between version 1.47 and 1.66.2.3

version 1.47, 2002/12/20 20:59:22 version 1.66.2.3, 2007/08/24 20:07:38
Line 15 
Line 15 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software   * 3. Neither the name of the University nor the names of its contributors
  *    must display the following acknowledgement:  
  *      This product includes software developed by the University of  
  *      California, Berkeley and its contributors.  
  * 4. Neither the name of the University nor the names of its contributors  
  *    may be used to endorse or promote products derived from this software   *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.   *    without specific prior written permission.
  *   *
Line 41 
Line 37 
 #ifndef _STDIO_H_  #ifndef _STDIO_H_
 #define _STDIO_H_  #define _STDIO_H_
   
 #include <sys/ansi.h>  
   
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
 #include <sys/featuretest.h>  #include <sys/featuretest.h>
   #include <sys/ansi.h>
   
 #include <machine/ansi.h>  #include <machine/ansi.h>
 #ifdef  _BSD_SIZE_T_  #ifdef  _BSD_SIZE_T_
Line 111  typedef struct __sFILE {
Line 106  typedef struct __sFILE {
         unsigned char *_p;      /* current position in (some) buffer */          unsigned char *_p;      /* current position in (some) buffer */
         int     _r;             /* read space left for getc() */          int     _r;             /* read space left for getc() */
         int     _w;             /* write space left for putc() */          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 */          short   _file;          /* fileno, if Unix descriptor, else -1 */
         struct  __sbuf _bf;     /* the buffer (at least 1 byte, if !NULL) */          struct  __sbuf _bf;     /* the buffer (at least 1 byte, if !NULL) */
         int     _lbfsize;       /* 0 or -_bf._size, for inline putc */          int     _lbfsize;       /* 0 or -_bf._size, for inline putc */
   
         /* operations */          /* operations */
         void    *_cookie;       /* cookie passed to io functions */          void    *_cookie;       /* cookie passed to io functions */
         int     (*_close) __P((void *));          int     (*_close)(void *);
         int     (*_read)  __P((void *, char *, int));          int     (*_read) (void *, char *, int);
         fpos_t  (*_seek)  __P((void *, fpos_t, int));          fpos_t  (*_seek) (void *, fpos_t, int);
         int     (*_write) __P((void *, const char *, int));          int     (*_write)(void *, const char *, int);
   
         /* file extension */          /* file extension */
         struct  __sbuf _ext;          struct  __sbuf _ext;
Line 189  __END_DECLS
Line 184  __END_DECLS
 #define FILENAME_MAX    1024    /* must be <= PATH_MAX <sys/syslimits.h> */  #define FILENAME_MAX    1024    /* must be <= PATH_MAX <sys/syslimits.h> */
   
 /* System V/ANSI C; this is the wrong way to do this, do *not* use these. */  /* 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/"  #define P_tmpdir        "/var/tmp/"
 #endif  #endif
 #define L_tmpnam        1024    /* XXX must be == PATH_MAX */  #define L_tmpnam        1024    /* XXX must be == PATH_MAX */
 #define TMP_MAX         308915776  /* Always ensure that this is consistent with <limits.h> */
   #ifndef TMP_MAX
   #define TMP_MAX                 308915776       /* Legacy */
   #endif
   
 /* Always ensure that these are consistent with <fcntl.h> and <unistd.h>! */  /* Always ensure that these are consistent with <fcntl.h> and <unistd.h>! */
 #ifndef SEEK_SET  #ifndef SEEK_SET
Line 214  __END_DECLS
Line 212  __END_DECLS
  * Functions defined in ANSI C standard.   * Functions defined in ANSI C standard.
  */   */
 __BEGIN_DECLS  __BEGIN_DECLS
 void     clearerr __P((FILE *));  void     clearerr(FILE *);
 int      fclose __P((FILE *));  int      fclose(FILE *);
 int      feof __P((FILE *));  int      feof(FILE *);
 int      ferror __P((FILE *));  int      ferror(FILE *);
 int      fflush __P((FILE *));  int      fflush(FILE *);
 int      fgetc __P((FILE *));  int      fgetc(FILE *);
 int      fgetpos __P((FILE * __restrict, fpos_t * __restrict));  int      fgetpos(FILE * __restrict, fpos_t * __restrict);
 char    *fgets __P((char * __restrict, int, FILE * __restrict));  char    *fgets(char * __restrict, int, FILE * __restrict);
 FILE    *fopen __P((const char *, const char *));  FILE    *fopen(const char * __restrict , const char * __restrict);
 int      fprintf __P((FILE * __restrict , const char * __restrict, ...));  int      fprintf(FILE * __restrict , const char * __restrict, ...);
 int      fputc __P((int, FILE *));  int      fputc(int, FILE *);
 int      fputs __P((const char * __restrict, FILE * __restrict));  int      fputs(const char * __restrict, FILE * __restrict);
 size_t   fread __P((void * __restrict, size_t, size_t, FILE * __restrict));  size_t   fread(void * __restrict, size_t, size_t, FILE * __restrict);
 FILE    *freopen __P((const char *, const char *, FILE * __restrict));  FILE    *freopen(const char * __restrict, const char * __restrict,
 int      fscanf __P((FILE * __restrict, const char * __restrict, ...));              FILE * __restrict);
 int      fseek __P((FILE *, long, int));  int      fscanf(FILE * __restrict, const char * __restrict, ...);
 int      fsetpos __P((FILE *, const fpos_t *));  int      fseek(FILE *, long, int);
 long     ftell __P((FILE *));  int      fsetpos(FILE *, const fpos_t *);
 size_t   fwrite __P((const void * __restrict, size_t, size_t,  long     ftell(FILE *);
             FILE * __restrict));  size_t   fwrite(const void * __restrict, size_t, size_t, FILE * __restrict);
 int      getc __P((FILE *));  int      getc(FILE *);
 int      getchar __P((void));  int      getchar(void);
 void     perror __P((const char *));  void     perror(const char *);
 int      printf __P((const char * __restrict, ...));  int      printf(const char * __restrict, ...);
 int      putc __P((int, FILE *));  int      putc(int, FILE *);
 int      putchar __P((int));  int      putchar(int);
 int      puts __P((const char *));  int      puts(const char *);
 int      remove __P((const char *));  int      remove(const char *);
 void     rewind __P((FILE *));  void     rewind(FILE *);
 int      scanf __P((const char * __restrict, ...));  int      scanf(const char * __restrict, ...);
 void     setbuf __P((FILE * __restrict, char * __restrict));  void     setbuf(FILE * __restrict, char * __restrict);
 int      setvbuf __P((FILE * __restrict, char * __restrict, int, size_t));  int      setvbuf(FILE * __restrict, char * __restrict, int, size_t);
 int      sscanf __P((const char * __restrict, const char * __restrict, ...));  int      sscanf(const char * __restrict, const char * __restrict, ...);
 FILE    *tmpfile __P((void));  FILE    *tmpfile(void);
 int      ungetc __P((int, FILE *));  int      ungetc(int, FILE *);
 int      vfprintf __P((FILE * __restrict, const char * __restrict,  int      vfprintf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_);
             _BSD_VA_LIST_));  int      vprintf(const char * __restrict, _BSD_VA_LIST_);
 int      vprintf __P((const char * __restrict, _BSD_VA_LIST_));  
   
 #ifndef __AUDIT__  #ifndef __AUDIT__
 char    *gets __P((char *));  char    *gets(char *);
 int      sprintf __P((char * __restrict, const char * __restrict, ...));  int      sprintf(char * __restrict, const char * __restrict, ...);
 char    *tmpnam __P((char *));  char    *tmpnam(char *);
 int      vsprintf __P((char * __restrict, const char * __restrict,  int      vsprintf(char * __restrict, const char * __restrict,
             _BSD_VA_LIST_));              _BSD_VA_LIST_);
 #endif  #endif
   
 #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)  #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)
 int      rename  __P((const char *, const char *)) __RENAME(__posix_rename);  int      rename (const char *, const char *) __RENAME(__posix_rename);
 #else  #else
 int      rename  __P((const char *, const char *));  int      rename (const char *, const char *);
 #endif  #endif
 __END_DECLS  __END_DECLS
   
 /*  /*
  * IEEE Std 1003.1-90   * 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_ctermid       1024    /* size for ctermid(); PATH_MAX */
 #define L_cuserid       9       /* size for cuserid(); UT_NAMESIZE + 1 */  #define L_cuserid       9       /* size for cuserid(); UT_NAMESIZE + 1 */
   
 __BEGIN_DECLS  __BEGIN_DECLS
 char    *ctermid __P((char *));  char    *ctermid(char *);
 #ifndef __CUSERID_DECLARED  #ifndef __CUSERID_DECLARED
 #define __CUSERID_DECLARED  #define __CUSERID_DECLARED
 /* also declared in unistd.h */  /* also declared in unistd.h */
 char    *cuserid __P((char *));  char    *cuserid(char *);
 #endif /* __CUSERID_DECLARED */  #endif /* __CUSERID_DECLARED */
 FILE    *fdopen __P((int, const char *));  FILE    *fdopen(int, const char *);
 int      fileno __P((FILE *));  int      fileno(FILE *);
 __END_DECLS  __END_DECLS
 #endif /* not ANSI */  #endif /* not ANSI */
   
 /*  /*
  * IEEE Std 1003.1c-95, also adopted by X/Open CAE Spec Issue 5 Version 2   * IEEE Std 1003.1c-95, also adopted by X/Open CAE Spec Issue 5 Version 2
  */   */
 #if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \  #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
      !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 199506L || \      defined(_REENTRANT) || defined(_NETBSD_SOURCE)
     (_XOPEN_SOURCE - 0) >= 500 || defined(_REENTRANT)  __BEGIN_DECLS
 __BEGIN_DECLS  void    flockfile(FILE *);
 #if 0 /* not yet */  int     ftrylockfile(FILE *);
 void    flockfile __P((FILE *));  void    funlockfile(FILE *);
 int     ftrylockfile __P((FILE *));  int     getc_unlocked(FILE *);
 void    funlockfile __P((FILE *));  int     getchar_unlocked(void);
 #endif /* 0 */  int     putc_unlocked(int, FILE *);
 int     getc_unlocked __P((FILE *));  int     putchar_unlocked(int);
 int     getchar_unlocked __P((void));  
 int     putc_unlocked __P((int, FILE *));  
 int     putchar_unlocked __P((int));  
 __END_DECLS  __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.   * Functions defined in POSIX 1003.2 and XPG2 or later.
  */   */
 #if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \  #if (_POSIX_C_SOURCE - 0) >= 2 || (_XOPEN_SOURCE - 0) >= 2 || \
      !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 2 || \      defined(_NETBSD_SOURCE)
     (_XOPEN_SOURCE - 0) >= 2  
 __BEGIN_DECLS  __BEGIN_DECLS
 int      pclose __P((FILE *));  int      pclose(FILE *);
 FILE    *popen __P((const char *, const char *));  FILE    *popen(const char *, const char *);
 __END_DECLS  __END_DECLS
 #endif  #endif
   
 /*  /*
  * Functions defined in XPG4.2.   * Functions defined in ISO XPG4.2, ISO C99, POSIX 1003.1-2001 or later.
  */   */
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) || \  #if ((__STDC_VERSION__ - 0) >= 199901L) || \
     defined(_XOPEN_SOURCE)      ((_POSIX_C_SOURCE - 0) >= 200112L) || \
       (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \
       ((_XOPEN_SOURCE - 0) >= 500) || \
       defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
 __BEGIN_DECLS  __BEGIN_DECLS
 int      getw __P((FILE *));  int      snprintf(char * __restrict, size_t, const char * __restrict, ...)
 int      putw __P((int, FILE *));  
 int      snprintf __P((char * __restrict, size_t, const char * __restrict, ...))  
             __attribute__((__format__(__printf__, 3, 4)));              __attribute__((__format__(__printf__, 3, 4)));
 int      vsnprintf __P((char * __restrict, size_t, const char * __restrict,  int      vsnprintf(char * __restrict, size_t, const char * __restrict,
             _BSD_VA_LIST_))              _BSD_VA_LIST_)
             __attribute__((__format__(__printf__, 3, 0)));              __attribute__((__format__(__printf__, 3, 0)));
   __END_DECLS
   #endif
   
   /*
    * Functions defined in XPG4.2.
    */
   #if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
   __BEGIN_DECLS
   int      getw(FILE *);
   int      putw(int, FILE *);
   
 #ifndef __AUDIT__  #ifndef __AUDIT__
 char    *tempnam __P((const char *, const char *));  char    *tempnam(const char *, const char *);
 #endif  #endif
 __END_DECLS  __END_DECLS
 #endif  #endif
Line 341  __END_DECLS
Line 346  __END_DECLS
 /*  /*
  * X/Open CAE Specification Issue 5 Version 2   * X/Open CAE Specification Issue 5 Version 2
  */   */
 #if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \  #if (_XOPEN_SOURCE - 0) >= 500 || defined(_LARGEFILE_SOURCE) || \
     (_XOPEN_SOURCE - 0) >= 500 || defined(_LARGEFILE_SOURCE)      defined(_NETBSD_SOURCE)
 #ifndef off_t  #ifndef off_t
 typedef __off_t         off_t;  typedef __off_t         off_t;
 #define off_t           __off_t  #define off_t           __off_t
 #endif /* off_t */  #endif /* off_t */
   
 __BEGIN_DECLS  __BEGIN_DECLS
 int      fseeko __P((FILE *, off_t, int));  int      fseeko(FILE *, off_t, int);
 off_t    ftello __P((FILE *));  off_t    ftello(FILE *);
 __END_DECLS  __END_DECLS
 #endif /* (!_POSIX_SOURCE && !_XOPEN_SOURCE) || ... */  #endif /* _XOPEN_SOURCE >= 500 || _LARGEFILE_SOURCE || _NETBSD_SOURCE */
   
 /*  /*
  * Routines that are purely local.   * Routines that are purely local.
  */   */
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \  #if defined(_NETBSD_SOURCE)
     !defined(_XOPEN_SOURCE)  
   
 #define FPARSELN_UNESCESC       0x01  #define FPARSELN_UNESCESC       0x01
 #define FPARSELN_UNESCCONT      0x02  #define FPARSELN_UNESCCONT      0x02
Line 367  __END_DECLS
Line 371  __END_DECLS
 #define FPARSELN_UNESCALL       0x0f  #define FPARSELN_UNESCALL       0x0f
   
 __BEGIN_DECLS  __BEGIN_DECLS
 int      asprintf __P((char ** __restrict, const char * __restrict, ...))  int      asprintf(char ** __restrict, const char * __restrict, ...)
             __attribute__((__format__(__printf__, 2, 3)));              __attribute__((__format__(__printf__, 2, 3)));
 char    *fgetln __P((FILE * __restrict, size_t * __restrict));  char    *fgetln(FILE * __restrict, size_t * __restrict);
 char    *fparseln(FILE *, size_t *, size_t *, const char[3], int);  char    *fparseln(FILE *, size_t *, size_t *, const char[3], int);
 int      fpurge __P((FILE *));  int      fpurge(FILE *);
 void     setbuffer __P((FILE *, char *, int));  void     setbuffer(FILE *, char *, int);
 int      setlinebuf __P((FILE *));  int      setlinebuf(FILE *);
 int      vasprintf __P((char ** __restrict, const char * __restrict,  int      vasprintf(char ** __restrict, const char * __restrict,
             _BSD_VA_LIST_))              _BSD_VA_LIST_)
             __attribute__((__format__(__printf__, 2, 0)));              __attribute__((__format__(__printf__, 2, 0)));
 int      vscanf __P((const char * __restrict, _BSD_VA_LIST_))  int      vscanf(const char * __restrict, _BSD_VA_LIST_)
             __attribute__((__format__(__scanf__, 1, 0)));              __attribute__((__format__(__scanf__, 1, 0)));
 int      vfscanf __P((FILE * __restrict, const char * __restrict,  int      vfscanf(FILE * __restrict, const char * __restrict,
             _BSD_VA_LIST_))              _BSD_VA_LIST_)
             __attribute__((__format__(__scanf__, 2, 0)));              __attribute__((__format__(__scanf__, 2, 0)));
 int      vsscanf __P((const char * __restrict, const char * __restrict,  int      vsscanf(const char * __restrict, const char * __restrict,
             _BSD_VA_LIST_))              _BSD_VA_LIST_)
             __attribute__((__format__(__scanf__, 2, 0)));              __attribute__((__format__(__scanf__, 2, 0)));
 __const char *fmtcheck __P((const char *, const char *))  const char *fmtcheck(const char *, const char *)
             __attribute__((__format_arg__(2)));              __attribute__((__format_arg__(2)));
 __END_DECLS  __END_DECLS
   
Line 393  __END_DECLS
Line 397  __END_DECLS
  * Stdio function-access interface.   * Stdio function-access interface.
  */   */
 __BEGIN_DECLS  __BEGIN_DECLS
 FILE    *funopen __P((const void *,  FILE    *funopen(const void *,
                 int (*)(void *, char *, int),                  int (*)(void *, char *, int),
                 int (*)(void *, const char *, int),                  int (*)(void *, const char *, int),
                 fpos_t (*)(void *, fpos_t, int),                  fpos_t (*)(void *, fpos_t, int),
                 int (*)(void *)));                  int (*)(void *));
 __END_DECLS  __END_DECLS
 #define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)  #define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
 #define fwopen(cookie, fn) funopen(cookie, 0, fn, 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.   * Functions internal to the implementation.
  */   */
 __BEGIN_DECLS  __BEGIN_DECLS
 int     __srget __P((FILE *));  int     __srget(FILE *);
 int     __swbuf __P((int, FILE *));  int     __swbuf(int, FILE *);
 __END_DECLS  __END_DECLS
   
 /*  /*
Line 442  static __inline int __sputc(int _c, FILE
Line 446  static __inline int __sputc(int _c, FILE
 #define __sclearerr(p)  ((void)((p)->_flags &= ~(__SERR|__SEOF)))  #define __sclearerr(p)  ((void)((p)->_flags &= ~(__SERR|__SEOF)))
 #define __sfileno(p)    ((p)->_file)  #define __sfileno(p)    ((p)->_file)
   
 #ifndef lint  #ifndef __lint__
 #ifndef _REENTRANT  #if !defined(_REENTRANT) && !defined(_PTHREADS)
 #define feof(p)         __sfeof(p)  #define feof(p)         __sfeof(p)
 #define ferror(p)       __sferror(p)  #define ferror(p)       __sferror(p)
 #define clearerr(p)     __sclearerr(p)  #define clearerr(p)     __sclearerr(p)
   
 #define getc(fp)        __sgetc(fp)  #define getc(fp)        __sgetc(fp)
 #define putc(x, fp)     __sputc(x, fp)  #define putc(x, fp)     __sputc(x, fp)
 #endif /* !_REENTRANT */  #endif /* !_REENTRANT && !_PTHREADS */
 #endif /* lint */  #endif /* __lint__ */
   
 #define getchar()       getc(stdin)  #define getchar()       getc(stdin)
 #define putchar(x)      putc(x, stdout)  #define putchar(x)      putc(x, stdout)
   
 #ifndef _ANSI_SOURCE  #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
 #ifndef _REENTRANT      defined(_NETBSD_SOURCE)
   #if !defined(_REENTRANT) && !defined(_PTHREADS)
 #define fileno(p)       __sfileno(p)  #define fileno(p)       __sfileno(p)
 #endif /* !_REENTRANT */  #endif /* !_REENTRANT && !_PTHREADS */
 #endif /* !_ANSI_SOURCE */  #endif /* !_ANSI_SOURCE */
   
 #if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \  #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
      !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 199506L || \      defined(_REENTRANT) || defined(_NETBSD_SOURCE)
     (_XOPEN_SOURCE - 0) >= 500 || defined(_REENTRANT)  
 #define getc_unlocked(fp)       __sgetc(fp)  #define getc_unlocked(fp)       __sgetc(fp)
 #define putc_unlocked(x, fp)    __sputc(x, fp)  #define putc_unlocked(x, fp)    __sputc(x, fp)
   
 #define getchar_unlocked()      getc_unlocked(stdin)  #define getchar_unlocked()      getc_unlocked(stdin)
 #define putchar_unlocked(x)     putc_unlocked(x, stdout)  #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... */
   
   #if _FORTIFY_SOURCE > 0
   #include <ssp/stdio.h>
   #endif
   
 #endif /* _STDIO_H_ */  #endif /* _STDIO_H_ */

Legend:
Removed from v.1.47  
changed lines
  Added in v.1.66.2.3

CVSweb <webmaster@jp.NetBSD.org>