[src/trunk]: src/external/bsd/libarchive/dist/libarchive Merge libarchive 2.8.4

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2c4bb5dd4d9c
branches:  trunk
changeset: 756377:2c4bb5dd4d9c
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Jul 14 22:13:58 2010 +0000

description:
Merge libarchive 2.8.4

diffstat:

 external/bsd/libarchive/dist/libarchive/archive_read.3                      |  2 +-
 external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c |  5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 2fb5e4a06cf2 -r 2c4bb5dd4d9c external/bsd/libarchive/dist/libarchive/archive_read.3
--- a/external/bsd/libarchive/dist/libarchive/archive_read.3    Wed Jul 14 22:10:39 2010 +0000
+++ b/external/bsd/libarchive/dist/libarchive/archive_read.3    Wed Jul 14 22:13:58 2010 +0000
@@ -591,7 +591,7 @@
   archive_read_support_format_all(a);
   archive_read_open(a, mydata, myopen, myread, myclose);
   while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    printf("%s\\n",archive_entry_pathname(entry));
+    printf("%s\en",archive_entry_pathname(entry));
     archive_read_data_skip(a);
   }
   archive_read_finish(a);
diff -r 2fb5e4a06cf2 -r 2c4bb5dd4d9c external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c
--- a/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c       Wed Jul 14 22:10:39 2010 +0000
+++ b/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c       Wed Jul 14 22:13:58 2010 +0000
@@ -210,7 +210,7 @@
                acl = acl_get_link_np(accpath, ACL_TYPE_ACCESS);
 #else
        else if ((!a->follow_symlinks)
-           && (archive_entry_filetype(entry) == AE_IFLNK)))
+           && (archive_entry_filetype(entry) == AE_IFLNK))
                /* We can't get the ACL of a symlink, so we assume it can't
                   have one. */
                acl = NULL;
@@ -425,7 +425,8 @@
        return (ARCHIVE_OK);
 }
 
-#elif HAVE_EXTATTR_GET_FILE && HAVE_EXTATTR_LIST_FILE
+#elif HAVE_EXTATTR_GET_FILE && HAVE_EXTATTR_LIST_FILE && \
+    HAVE_DECL_EXTATTR_NAMESPACE_USER
 
 /*
  * FreeBSD extattr interface.