BSD 4 release

[unix-history] / usr / src / cmd / ar11.c

diff --git a/usr/src/cmd/ar11.c b/usr/src/cmd/ar11.c
index edde067..75ffe61 100644 (file)
--- a/usr/src/cmd/ar11.c
+++ b/usr/src/cmd/ar11.c
@@ -1,4 +1,4 @@
-
+static char *sccsid = "@(#)ar11.c      4.1 (Berkeley) 10/1/80";

 /* ar11 - archiver for PDP-11 formatted archives */
 
 #include <signal.h>
 /* ar11 - archiver for PDP-11 formatted archives */
 
 #include <signal.h>


@@ -23,7 +23,7 @@ struct        stat    stbuf;
 struct ar_hdr  arbuf;
 union ints
 {
 struct ar_hdr  arbuf;
 union ints
 {

-       struct
+       struct fun

        {
                short h1;
                short h2;
        {
                short h1;
                short h2;


@@ -36,8 +36,8 @@ union ints
 #define        OODD    4
 #define        HEAD    8
 
 #define        OODD    4
 #define        HEAD    8
 

-char   *man    { "mrxtdp" };
-char   *opt    { "uvnbai" };
+char   *man    = { "mrxtdp" };
+char   *opt    = { "uvnbai" };

 
 int    signum[] = {SIGHUP, SIGINT, SIGQUIT, 0};
 int    sigdone();
 
 int    signum[] = {SIGHUP, SIGINT, SIGQUIT, 0};
 int    sigdone();


@@ -483,7 +483,7 @@ copyfil(fi, fo, flag)
                if((flag & SKIP) == 0)
                        if (write(fo, buf, o) != o)
                                wrerr();
                if((flag & SKIP) == 0)
                        if (write(fo, buf, o) != o)
                                wrerr();

-               ar_size =- 512;
+               ar_size -= 512;

        }
        if(pe)
                phserr();
        }
        if(pe)
                phserr();


@@ -616,17 +616,17 @@ longt()
        printf(" %-12.12s %-4.4s ", cp+4, cp+20);
 }
 
        printf(" %-12.12s %-4.4s ", cp+4, cp+20);
 }
 

-int    m1[] { 1, ROWN, 'r', '-' };
-int    m2[] { 1, WOWN, 'w', '-' };
-int    m3[] { 2, SUID, 's', XOWN, 'x', '-' };
-int    m4[] { 1, RGRP, 'r', '-' };
-int    m5[] { 1, WGRP, 'w', '-' };
-int    m6[] { 2, SGID, 's', XGRP, 'x', '-' };
-int    m7[] { 1, ROTH, 'r', '-' };
-int    m8[] { 1, WOTH, 'w', '-' };
-int    m9[] { 2, STXT, 't', XOTH, 'x', '-' };
+int    m1[] = { 1, ROWN, 'r', '-' };
+int    m2[] = { 1, WOWN, 'w', '-' };
+int    m3[] = { 2, SUID, 's', XOWN, 'x', '-' };
+int    m4[] = { 1, RGRP, 'r', '-' };
+int    m5[] = { 1, WGRP, 'w', '-' };
+int    m6[] = { 2, SGID, 's', XGRP, 'x', '-' };
+int    m7[] = { 1, ROTH, 'r', '-' };
+int    m8[] = { 1, WOTH, 'w', '-' };
+int    m9[] = { 2, STXT, 't', XOTH, 'x', '-' };

 
 

-int    *m[] { m1, m2, m3, m4, m5, m6, m7, m8, m9};
+int    *m[] = { m1, m2, m3, m4, m5, m6, m7, m8, m9};

 
 pmode()
 {
 
 pmode()
 {


@@ -657,8 +657,8 @@ wrerr()
 swap(word)
 short *word;
 {
 swap(word)
 short *word;
 {

-       x.h1 = word->h2;
-       x.h2 = word->h1;
+       x.h1 = ((struct fun *)word)->h2;
+       x.h2 = ((struct fun *)word)->h1;

        
        return(x.w1);
 }
        
        return(x.w1);
 }