date and time created 88/07/21 17:33:41 by marc

[unix-history] / usr / src / local / local.cmd / cpio.c

diff --git a/usr/src/local/local.cmd/cpio.c b/usr/src/local/local.cmd/cpio.c
index 5779251..6a3f04e 100644 (file)
--- a/usr/src/local/local.cmd/cpio.c
+++ b/usr/src/local/local.cmd/cpio.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1983 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1983 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)cpio.c     4.1     (Berkeley)      %G%";
+static char sccsid[] = "@(#)cpio.c     4.3     (Berkeley)      %G%";

 #endif not lint
 
 /*     cpio    COMPILE:        cc -O cpio.c -s -i -o cpio 
 #endif not lint
 
 /*     cpio    COMPILE:        cc -O cpio.c -s -i -o cpio 


@@ -459,7 +459,7 @@ long t;
 
 chartobin()
 {
 
 chartobin()
 {

-       sscanf(Chdr,"%6o%6ho%6ho%6ho%6ho%6ho%6ho%6ho%11lo%6ho%11lo",
+       sscanf(Chdr,"%6ho%6ho%6ho%6ho%6ho%6ho%6ho%6ho%11lo%6ho%11lo",

                &Hdr.h_magic,&Hdr.h_dev,&Hdr.h_ino,&Hdr.h_mode,&Hdr.h_uid,
                &Hdr.h_gid,&Hdr.h_nlink,&Hdr.h_rdev,&Longtime,&Hdr.h_namesize,
                &Longfile);
                &Hdr.h_magic,&Hdr.h_dev,&Hdr.h_ino,&Hdr.h_mode,&Hdr.h_uid,
                &Hdr.h_gid,&Hdr.h_nlink,&Hdr.h_rdev,&Longtime,&Hdr.h_namesize,
                &Longfile);


@@ -478,7 +478,7 @@ gethdr()
                bread(&Hdr, HDRSIZE);
 
        if(Hdr.h_magic != MAGIC) {
                bread(&Hdr, HDRSIZE);
 
        if(Hdr.h_magic != MAGIC) {

-               err("Out of phase--get help");
+               err("Out of phase--get help\n");

                exit(2);
        }
        if(!Cflag)
                exit(2);
        }
        if(!Cflag)


@@ -501,7 +501,7 @@ gethdr()
                Actual_size[1] = Hdr.h_filesize[1];
                bread(&Hdr, HDRSIZE);
                if(Hdr.h_magic != MAGIC) {
                Actual_size[1] = Hdr.h_filesize[1];
                bread(&Hdr, HDRSIZE);
                if(Hdr.h_magic != MAGIC) {

-                       err("Out of phase--get MERT help");
+                       err("Out of phase--get MERT help\n");

                        exit(2);
                }
                bread(Hdr.h_name, Hdr.h_namesize);
                        exit(2);
                }
                bread(Hdr.h_name, Hdr.h_namesize);