Loading...
include/stdio.h Libc-391.2.6 Libc-262.3.2
--- Libc/Libc-391.2.6/include/stdio.h
+++ Libc/Libc-262.3.2/include/stdio.h
@@ -2,6 +2,8 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -61,29 +63,39 @@
 #ifndef	_STDIO_H_
 #define	_STDIO_H_
 
-#include <_types.h>
+#if !defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__)
+#include <sys/types.h>
+#endif
+
 #include <sys/cdefs.h>
 
-#ifndef _VA_LIST
-#define _VA_LIST
-/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
- * __gnuc_va_list and include <stdarg.h> */
-typedef __darwin_va_list	va_list;
-#endif
-
-#ifndef	_SIZE_T
-#define	_SIZE_T
-typedef	__darwin_size_t		size_t;
+#include <machine/ansi.h>
+#ifndef	_BSD_SIZE_T_DEFINED_
+#define	_BSD_SIZE_T_DEFINED_
+typedef	_BSD_SIZE_T_	size_t;
 #endif
 
 #ifndef NULL
-#define NULL __DARWIN_NULL
-#endif /* ! NULL */
-
+#define	NULL	0
+#endif
+
+/*
+ * This is fairly grotesque, but pure ANSI code must not inspect the
+ * innards of an fpos_t anyway.  The library internally uses off_t,
+ * which we assume is exactly as big as eight chars.  (When we switch
+ * to gcc 2.4 we will use __attribute__ here.)
+ *
+ * WARNING: the alignment constraints on an off_t and the struct below
+ * differ on (e.g.) the SPARC.  Hence, the placement of an fpos_t object
+ * in a structure will change if fpos_t's are not aligned on 8-byte
+ * boundaries.  THIS IS A CROCK, but for now there is no way around it.
+ */
 #if !defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__)
-typedef __darwin_off_t		fpos_t;
+typedef off_t fpos_t;
 #else
-typedef __int64_t		fpos_t;
+typedef struct __sfpos {
+	char	_pos[8];
+} fpos_t;
 #endif
 
 #define	_FSTDIO			/* Define for new stdio with functions. */
@@ -96,12 +108,9 @@
 
 /* stdio buffers */
 struct __sbuf {
-	unsigned char	*_base;
-	int		_size;
+	unsigned char *_base;
+	int	_size;
 };
-
-/* hold a buncha junk that would grow the ABI */
-struct __sFILEX;
 
 /*
  * stdio state variables.
@@ -140,14 +149,14 @@
 
 	/* operations */
 	void	*_cookie;	/* cookie passed to io functions */
-	int	(*_close)(void *);
-	int	(*_read) (void *, char *, int);
-	fpos_t	(*_seek) (void *, fpos_t, int);
-	int	(*_write)(void *, const char *, int);
+	int	(*_close) __P((void *));
+	int	(*_read)  __P((void *, char *, int));
+	fpos_t	(*_seek)  __P((void *, fpos_t, int));
+	int	(*_write) __P((void *, const char *, int));
 
 	/* separate buffer for long sequences of ungetc() */
 	struct	__sbuf _ub;	/* ungetc buffer */
-	struct __sFILEX *_extra; /* additions to FILE to not break ABI */
+	unsigned char *_up;	/* saved _p when _p is doing ungetc data */
 	int	_ur;		/* saved _r when _r is counting ungetc data */
 
 	/* tricks to meet minimum requirements even when malloc() fails */
@@ -163,13 +172,7 @@
 } FILE;
 
 __BEGIN_DECLS
-#if __DARWIN_UNIX03
-extern FILE *__stdinp;
-extern FILE *__stdoutp;
-extern FILE *__stderrp;
-#else /* !__DARWIN_UNIX03 */
 extern FILE __sF[];
-#endif /* __DARWIN_UNIX03 */
 __END_DECLS
 
 #define	__SLBF	0x0001		/* line buffered */
@@ -188,7 +191,6 @@
 #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 */
-#define __SIGN  0x8000		/* ignore this file in _fwalk */
 
 /*
  * The following three definitions are for ANSI C, which took them
@@ -232,70 +234,61 @@
 #define	SEEK_END	2	/* set file offset to EOF plus offset */
 #endif
 
-#if __DARWIN_UNIX03
-#define	stdin	__stdinp
-#define	stdout	__stdoutp
-#define	stderr	__stderrp
-#else /* !__DARWIN_UNIX03 */
-#define stdin	(&__sF[0])
-#define stdout	(&__sF[1])
-#define stderr	(&__sF[2])
-#endif /* __DARWIN_UNIX03 */
+#define	stdin	(&__sF[0])
+#define	stdout	(&__sF[1])
+#define	stderr	(&__sF[2])
 
 /*
  * Functions defined in ANSI C standard.
  */
 __BEGIN_DECLS
-void	 clearerr(FILE *);
-int	 fclose(FILE *);
-int	 feof(FILE *);
-int	 ferror(FILE *);
-int	 fflush(FILE *);
-int	 fgetc(FILE *);
-int	 fgetpos(FILE * __restrict, fpos_t *);
-char	*fgets(char * __restrict, int, FILE *);
-FILE	*fopen(const char * __restrict, const char * __restrict);
-int	 fprintf(FILE * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(fprintf);
-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) __DARWIN_ALIAS(freopen);
-int	 fscanf(FILE * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(fscanf);
-int	 fseek(FILE *, long, int);
-int	 fsetpos(FILE *, const fpos_t *);
-long	 ftell(FILE *);
-size_t	 fwrite(const void * __restrict, size_t, size_t, FILE * __restrict) __DARWIN_ALIAS(fwrite);
-int	 getc(FILE *);
-int	 getchar(void);
-char	*gets(char *);
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE)
+void	 clearerr __P((FILE *));
+int	 fclose __P((FILE *));
+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 *));
+FILE	*fopen __P((const char *, const char *));
+int	 fprintf __P((FILE *, const char *, ...));
+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	 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 *));
+int	 getc __P((FILE *));
+int	 getchar __P((void));
+char	*gets __P((char *));
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 extern __const int sys_nerr;		/* perror(3) external variables */
 extern __const char *__const sys_errlist[];
 #endif
-void	 perror(const char *);
-int	 printf(const char * __restrict, ...) __DARWIN_LDBL_COMPAT(printf);
-int	 putc(int, FILE *);
-int	 putchar(int);
-int	 puts(const char *);
-int	 remove(const char *);
-int	 rename (const char *, const char *);
-void	 rewind(FILE *);
-int	 scanf(const char * __restrict, ...) __DARWIN_LDBL_COMPAT(scanf);
-void	 setbuf(FILE * __restrict, char * __restrict);
-int	 setvbuf(FILE * __restrict, char * __restrict, int, size_t);
-int	 sprintf(char * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(sprintf);
-int	 sscanf(const char * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(sscanf);
-FILE	*tmpfile(void);
-char	*tmpnam(char *);
-int	 ungetc(int, FILE *);
-int	 vfprintf(FILE * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vfprintf);
-int	 vprintf(const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vprintf);
-int	 vsprintf(char * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vsprintf);
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE)
-int	 asprintf(char **, const char *, ...) __DARWIN_LDBL_COMPAT(asprintf);
-int	 vasprintf(char **, const char *, va_list) __DARWIN_LDBL_COMPAT(vasprintf);
-#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 *, _BSD_VA_LIST_));
+int	 vprintf __P((const char *, _BSD_VA_LIST_));
+int	 vsprintf __P((char *, const char *, _BSD_VA_LIST_));
+int	 asprintf __P((char **, const char *, ...));
+int	 vasprintf __P((char **, const char *, _BSD_VA_LIST_));
 __END_DECLS
 
 /*
@@ -306,73 +299,63 @@
 #define	L_ctermid	1024	/* size for ctermid(); PATH_MAX */
 
 __BEGIN_DECLS
-char	*ctermid(char *);
-#ifndef _POSIX_C_SOURCE
-char	*ctermid_r(char *);
-#endif /* not POSIX */
-FILE	*fdopen(int, const char *);
-#ifndef _POSIX_C_SOURCE
-char	*fgetln(FILE *, size_t *);
-#endif /* not POSIX */
-int	 fileno(FILE *);
-void	 flockfile(FILE *);
-#ifndef _POSIX_C_SOURCE
-__const char 
-	*fmtcheck(const char *, const char *);
-int	 fpurge(FILE *);
-#endif /* not POSIX */
-int	 fseeko(FILE *, fpos_t, int);
-fpos_t	 ftello(FILE *);
-int	 ftrylockfile(FILE *);
-void	 funlockfile(FILE *);
-int	 getc_unlocked(FILE *);
-int	 getchar_unlocked(void);
-#ifndef _POSIX_C_SOURCE
-int	 getw(FILE *);
-#endif /* not POSIX */
-int	 pclose(FILE *);
-FILE	*popen(const char *, const char *);
-int	 putc_unlocked(int, FILE *);
-int	 putchar_unlocked(int);
-#ifndef _POSIX_C_SOURCE
-int	 putw(int, FILE *);
-void	 setbuffer(FILE *, char *, int);
-int	 setlinebuf(FILE *);
-#endif /* not POSIX */
-int	 snprintf(char * __restrict, size_t, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(snprintf);
-char	*tempnam(const char *, const char *);
-int	 vfscanf(FILE * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vfscanf);
-int	 vscanf(const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vscanf);
-int	 vsnprintf(char * __restrict, size_t, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vsnprintf);
-int	 vsscanf(const char * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vsscanf);
-#ifndef _POSIX_C_SOURCE
-FILE	*zopen(const char *, const char *, int);
-#endif /* not POSIX */
-__END_DECLS
+char	*ctermid __P((char *));
+FILE	*fdopen __P((int, const char *));
+int	 fileno __P((FILE *));
+__END_DECLS
+#endif /* not ANSI */
+
+/*
+ * Routines that are purely local.
+ */
+#if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+__BEGIN_DECLS
+char	*fgetln __P((FILE *, size_t *));
+int	 fpurge __P((FILE *));
+int	 fseeko __P((FILE *, fpos_t, int));
+fpos_t	ftello __P((FILE *));
+int	 getw __P((FILE *));
+int	 pclose __P((FILE *));
+FILE	*popen __P((const char *, const char *));
+int	 putw __P((int, 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 *, ...));
+int	 vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_));
+int	 vscanf __P((const char *, _BSD_VA_LIST_));
+int	 vsscanf __P((const char *, const char *, _BSD_VA_LIST_));
+FILE	*zopen __P((const char *, const char *, int));
+__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.
  */
-#ifndef _POSIX_C_SOURCE
-__BEGIN_DECLS
-FILE	*funopen(const void *,
+__BEGIN_DECLS
+FILE	*funopen __P((const void *,
 		int (*)(void *, char *, int),
 		int (*)(void *, const char *, int),
 		fpos_t (*)(void *, fpos_t, int),
-		int (*)(void *));
+		int (*)(void *)));
 __END_DECLS
 #define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
 #define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
-#endif /* not POSIX */
-#endif /* not ANSI */
+#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
 
 /*
  * Functions internal to the implementation.
  */
 __BEGIN_DECLS
-int	__srget(FILE *);
-int	__svfscanf(FILE *, const char *, va_list) __DARWIN_LDBL_COMPAT(__svfscanf);
-int	__swbuf(int, FILE *);
+int	__srget __P((FILE *));
+int	__svfscanf __P((FILE *, const char *, _BSD_VA_LIST_));
+int	__swbuf __P((int, FILE *));
 __END_DECLS
 
 /*
@@ -406,25 +389,19 @@
 #define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
 #define	__sfileno(p)	((p)->_file)
 
+#define	feof(p)		__sfeof(p)
+#define	ferror(p)	__sferror(p)
+#define	clearerr(p)	__sclearerr(p)
+
 #ifndef _ANSI_SOURCE
-#ifndef _POSIX_C_SOURCE
-#define	feof_unlocked(p)	__sfeof(p)
-#define	ferror_unlocked(p)	__sferror(p)
-#define	clearerr_unlocked(p)	__sclearerr(p)
-#define	fileno_unlocked(p)	__sfileno(p)
-#endif /* not POSIX */
+#define	fileno(p)	__sfileno(p)
+#endif
 
 #ifndef lint
-#define	getc_unlocked(fp)	__sgetc(fp)
-#define putc_unlocked(x, fp)	__sputc(x, fp)
+#define	getc(fp)	__sgetc(fp)
+#define putc(x, fp)	__sputc(x, fp)
 #endif /* lint */
 
-#define	getchar_unlocked()	getc_unlocked(stdin)
-#define	putchar_unlocked(x)	putc_unlocked(x, stdout)
-#endif /* not ANSI */
-
-#ifdef _USE_EXTENDED_LOCALES_
-#include <xlocale/_stdio.h>
-#endif /* _USE_EXTENDED_LOCALES_ */
-
+#define	getchar()	getc(stdin)
+#define	putchar(x)	putc(x, stdout)
 #endif /* _STDIO_H_ */