]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix build failure on linux.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sun, 11 Nov 2012 10:54:24 +0000 (19:54 +0900)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sun, 11 Nov 2012 10:54:24 +0000 (19:54 +0900)
libarchive/archive_read_support_format_zip.c

index 377a98ba82e2dc40bd6dbe6baf9416f10787bc6b..c31f934354e8f263bc746af250044bc24f0b22f4 100644 (file)
@@ -363,7 +363,7 @@ rsrc_cmp_key(const struct archive_rb_node *n, const void *key)
 }
 
 static const char *
-basename(const char *name, size_t name_length)
+rsrc_basename(const char *name, size_t name_length)
 {
        const char *s, *r;
 
@@ -471,7 +471,7 @@ slurp_central_directory(struct archive_read *a, struct zip *zip)
                    == NULL)
                        return ARCHIVE_FATAL;
                name = p + 46;
-               r = basename(name, filename_length);
+               r = rsrc_basename(name, filename_length);
                if (filename_length >= 9 &&
                    strncmp("__MACOSX/", name, 9) == 0) {
                        /* If this file is not a resource fork nor