file reorg, pathnames.h, paths.h

[unix-history] / usr / src / old / cpio / cpio.c

diff --git a/usr/src/old/cpio/cpio.c b/usr/src/old/cpio/cpio.c
index 725898d..4235558 100644 (file)
--- a/usr/src/old/cpio/cpio.c
+++ b/usr/src/old/cpio/cpio.c
@@ -27,6 +27,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#include <paths.h>

 
 struct utimbuf {
        time_t  actime;
 
 struct utimbuf {
        time_t  actime;


@@ -129,7 +130,7 @@ static
 FILE   *Rtty,
        *Wtty;
 static
 FILE   *Rtty,
        *Wtty;
 static

-char   ttyname[] = "/dev/tty";
+char   ttyname[] = _PATH_TTY;

 
 static
 char   **Pattern = 0;
 
 static
 char   **Pattern = 0;


@@ -408,7 +409,7 @@ char **argv;
                                symlsz = (int) mklong(Hdr.h_filesize);
                                bread(Symlbuf, symlsz);
                                Symlbuf[symlsz] = '\0';
                                symlsz = (int) mklong(Hdr.h_filesize);
                                bread(Symlbuf, symlsz);
                                Symlbuf[symlsz] = '\0';

-                               if((void) ckname(Hdr.h_name)  &&  !Toc)
+                               if( ckname(Hdr.h_name)  &&  !Toc)

                                        (void)openout(Hdr.h_name, Symlbuf);
                        } else {
                                if( (select = ckname(Hdr.h_name))  &&  !Toc )
                                        (void)openout(Hdr.h_name, Symlbuf);
                        } else {
                                if( (select = ckname(Hdr.h_name))  &&  !Toc )


@@ -1485,3 +1486,28 @@ register unsigned        count;
 
        return  savedto;
 }
 
        return  savedto;
 }

+
+extern int _doprnt();
+
+/*VARARGS2*/
+int
+vfprintf(iop, format, ap)
+FILE *iop;
+char *format;
+va_list ap;
+{
+       register int count;
+
+       if (!(iop->_flag | _IOWRT)) {
+               /* if no write flag */
+               if (iop->_flag | _IORW) {
+                       /* if ok, cause read-write */
+                       iop->_flag |= _IOWRT;
+               } else {
+                       /* else error */
+                       return EOF;
+               }
+       }
+       count = _doprnt(format, ap, iop);
+       return(ferror(iop)? EOF: count);
+}