diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-13 18:17:26 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-13 18:17:26 +0000 |
| commit | d3fa82849b8416e2be7cf1cc8c0a19eb6aa6104a (patch) | |
| tree | f4878bf66b1174b1d7f6185faa6e3e3ed15616f8 /archivers/libarchive/files/libarchive/archive_write_set_format_ar.c | |
| parent | 3429a59e5231c735e57888d50377d400cbf42a96 (diff) | |
| download | pkgsrc-d3fa82849b8416e2be7cf1cc8c0a19eb6aa6104a.tar.gz | |
Update in-tree libarchive to 2.2.6. This merges the local changes
and some bugfixes from FreeBSD.
Diffstat (limited to 'archivers/libarchive/files/libarchive/archive_write_set_format_ar.c')
| -rw-r--r-- | archivers/libarchive/files/libarchive/archive_write_set_format_ar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c b/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c index bf3ea4de5d7..404b651311e 100644 --- a/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c +++ b/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c @@ -76,7 +76,7 @@ static ssize_t archive_write_ar_data(struct archive_write *, const void *buff, size_t s); static int archive_write_ar_destroy(struct archive_write *); static int archive_write_ar_finish_entry(struct archive_write *); -static const char *basename(const char *path); +static const char *ar_basename(const char *path); static int format_octal(int64_t v, char *p, int s); static int format_decimal(int64_t v, char *p, int s); @@ -192,11 +192,11 @@ archive_write_ar_header(struct archive_write *a, struct archive_entry *entry) goto size; } - /* + /* * Otherwise, entry is a normal archive member. * Strip leading paths from filenames, if any. */ - if ((filename = basename(pathname)) == NULL) { + if ((filename = ar_basename(pathname)) == NULL) { /* Reject filenames with trailing "/" */ archive_set_error(&a->archive, EINVAL, "Invalid filename"); @@ -507,7 +507,7 @@ format_decimal(int64_t v, char *p, int s) } static const char * -basename(const char *path) +ar_basename(const char *path) { const char *endp, *startp; |