projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ANSIfication; bug report 4.3BSD/bin/223
[unix-history]
/
usr
/
src
/
include
/
stdio.h
diff --git
a/usr/src/include/stdio.h
b/usr/src/include/stdio.h
index
f35c077
..
3a9117a
100644
(file)
--- a/
usr/src/include/stdio.h
+++ b/
usr/src/include/stdio.h
@@
-1,4
+1,11
@@
-/* stdio.h 1.12 85/05/30 */
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved. The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ * @(#)stdio.h 5.4 (Berkeley) %G%
+ */
+
# ifndef FILE
#define BUFSIZ 1024
extern struct _iobuf {
# ifndef FILE
#define BUFSIZ 1024
extern struct _iobuf {
@@
-26,8
+33,11
@@
extern struct _iobuf {
#define stdin (&_iob[0])
#define stdout (&_iob[1])
#define stderr (&_iob[2])
#define stdin (&_iob[0])
#define stdout (&_iob[1])
#define stderr (&_iob[2])
+#ifndef lint
#define getc(p) (--(p)->_cnt>=0? (int)(*(unsigned char *)(p)->_ptr++):_filbuf(p))
#define getc(p) (--(p)->_cnt>=0? (int)(*(unsigned char *)(p)->_ptr++):_filbuf(p))
+#endif not lint
#define getchar() getc(stdin)
#define getchar() getc(stdin)
+#ifndef lint
#define putc(x, p) (--(p)->_cnt >= 0 ?\
(int)(*(unsigned char *)(p)->_ptr++ = (x)) :\
(((p)->_flag & _IOLBF) && -(p)->_cnt < (p)->_bufsiz ?\
#define putc(x, p) (--(p)->_cnt >= 0 ?\
(int)(*(unsigned char *)(p)->_ptr++ = (x)) :\
(((p)->_flag & _IOLBF) && -(p)->_cnt < (p)->_bufsiz ?\
@@
-35,6
+45,7
@@
extern struct _iobuf {
(int)(*(unsigned char *)(p)->_ptr++) :\
_flsbuf(*(unsigned char *)(p)->_ptr, p)) :\
_flsbuf((unsigned char)(x), p)))
(int)(*(unsigned char *)(p)->_ptr++) :\
_flsbuf(*(unsigned char *)(p)->_ptr, p)) :\
_flsbuf((unsigned char)(x), p)))
+#endif not lint
#define putchar(x) putc(x,stdout)
#define feof(p) (((p)->_flag&_IOEOF)!=0)
#define ferror(p) (((p)->_flag&_IOERR)!=0)
#define putchar(x) putc(x,stdout)
#define feof(p) (((p)->_flag&_IOEOF)!=0)
#define ferror(p) (((p)->_flag&_IOERR)!=0)
@@
-46,10
+57,7
@@
FILE *fdopen();
FILE *freopen();
FILE *popen();
long ftell();
FILE *freopen();
FILE *popen();
long ftell();
-long fseek();
char *fgets();
char *gets();
char *fgets();
char *gets();
-#ifdef vax
-char *sprintf(); /* too painful to do right */
-#endif
+int sprintf(); /* here until everyone does it right */
# endif
# endif