ttar: rename sstrnlen to avoid OpenBSD compile error - plan9port - [fork] Plan 9 from user space
 (HTM) git clone git://src.adamsgaard.dk/plan9port
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit d67dc856d17c2e0491edccc20de8757ab4d59641
 (DIR) parent c006e984192aa8bcb755bdd25e111bb37b5db16b
 (HTM) Author: Russ Cox <rsc@swtch.com>
       Date:   Sun, 11 Jul 2010 09:48:51 -0700
       
       ttar: rename sstrnlen to avoid OpenBSD compile error
       
       R=, rsc
       CC=
       http://codereview.appspot.com/1810041
       
       Diffstat:
         M src/cmd/tar.c                       |      10 +++++-----
       
       1 file changed, 5 insertions(+), 5 deletions(-)
       ---
 (DIR) diff --git a/src/cmd/tar.c b/src/cmd/tar.c
       t@@ -423,7 +423,7 @@ isustar(Hdr *hp)
         * be NUL.
         */
        static int
       -sstrnlen(char *s, int n)
       +tar_sstrnlen(char *s, int n)
        {
                return s[n - 1] != '\0'? n: strlen(s);
        }
       t@@ -437,7 +437,7 @@ name(Hdr *hp)
                char *fullname;
        
                fullname = fullnamebuf+2;
       -        namlen = sstrnlen(hp->name, sizeof hp->name);
       +        namlen = tar_sstrnlen(hp->name, sizeof hp->name);
                if (hp->prefix[0] == '\0' || !isustar(hp)) {        /* old-style name? */
                        memmove(fullname, hp->name, namlen);
                        fullname[namlen] = '\0';
       t@@ -445,7 +445,7 @@ name(Hdr *hp)
                }
        
                /* name is in two pieces */
       -        pfxlen = sstrnlen(hp->prefix, sizeof hp->prefix);
       +        pfxlen = tar_sstrnlen(hp->prefix, sizeof hp->prefix);
                memmove(fullname, hp->prefix, pfxlen);
                fullname[pfxlen] = '/';
                memmove(fullname + pfxlen + 1, hp->name, namlen);
       t@@ -539,8 +539,8 @@ readhdr(int ar)
                        return nil;
                hdrcksum = strtoul(hp->chksum, nil, 8);
                if (chksum(hp) != hdrcksum)
       -                sysfatal("bad archive header checksum: name %.64s...",
       -                        hp->name);
       +                sysfatal("bad archive header checksum: name %.64s... %ld %ld",
       +                        hp->name, chksum(hp), hdrcksum);
                nexthdr += Tblock*(1 + BYTES2TBLKS(arsize(hp)));
                return hp;
        }