clean up

[unix-history] / usr / src / include / stdio.h

diff --git a/usr/src/include/stdio.h b/usr/src/include/stdio.h
index 90dd4a8..8d8f0f6 100644 (file)
--- a/usr/src/include/stdio.h
+++ b/usr/src/include/stdio.h
@@ -1,6 +1,6 @@
-/*     stdio.h 1.8     84/11/12        */
+/*     stdio.h 1.11    85/01/08        */

 #define        BUFSIZ  1024
 #define        BUFSIZ  1024

-#define        _NFILE  20
+#define        _NFILE  48

 # ifndef FILE
 extern struct  _iobuf {
        int     _cnt;
 # ifndef FILE
 extern struct  _iobuf {
        int     _cnt;


@@ -28,11 +28,15 @@ 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])

-#define        getc(p)         (--(p)->_cnt>=0? *(p)->_ptr++&0377:_filbuf(p))
+#define        getc(p)         (--(p)->_cnt>=0? (int)(*(unsigned char *)(p)->_ptr++):_filbuf(p))

 #define        getchar()       getc(stdin)
 #define        getchar()       getc(stdin)

-#define putc(x, p)     (--(p)->_cnt >= 0 || ((p)->_flag & _IOLBF) &&\
-               -(p)->_cnt <= (p)->_bufsiz && (x) != '\n' ?\
-               (int)(*(p)->_ptr++ = (unsigned)(x)) : _flsbuf((unsigned)(x), p))
+#define putc(x, p)     (--(p)->_cnt >= 0 ?\
+       (int)(*(unsigned char *)(p)->_ptr++ = (x)) :\
+       (((p)->_flag & _IOLBF) && -(p)->_cnt < (p)->_bufsiz ?\
+               ((*(p)->_ptr = (x)) != '\n' ?\
+                       (int)(*(unsigned char *)(p)->_ptr++) :\
+                       _flsbuf(*(unsigned char *)(p)->_ptr, p)) :\
+               _flsbuf((unsigned char)(x), p)))

 #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)