aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmd/tar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/tar.c b/src/cmd/tar.c
index 42dbef15..70ea8e0e 100644
--- a/src/cmd/tar.c
+++ b/src/cmd/tar.c
@@ -423,7 +423,7 @@ isustar(Hdr *hp)
* be NUL.
*/
static int
-strnlen(char *s, int n)
+sstrnlen(char *s, int n)
{
return s[n - 1] != '\0'? n: strlen(s);
}
@@ -437,7 +437,7 @@ name(Hdr *hp)
char *fullname;
fullname = fullnamebuf+2;
- namlen = strnlen(hp->name, sizeof hp->name);
+ namlen = sstrnlen(hp->name, sizeof hp->name);
if (hp->prefix[0] == '\0' || !isustar(hp)) { /* old-style name? */
memmove(fullname, hp->name, namlen);
fullname[namlen] = '\0';
@@ -445,7 +445,7 @@ name(Hdr *hp)
}
/* name is in two pieces */
- pfxlen = strnlen(hp->prefix, sizeof hp->prefix);
+ pfxlen = sstrnlen(hp->prefix, sizeof hp->prefix);
memmove(fullname, hp->prefix, pfxlen);
fullname[pfxlen] = '/';
memmove(fullname + pfxlen + 1, hp->name, namlen);