[src/trunk]: src/external/bsd/libarchive/dist/libarchive Merge for libarchive...

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

details:   https://anonhg.NetBSD.org/src/rev/2b5e705ff959
branches:  trunk
changeset: 753016:2b5e705ff959
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Mar 14 19:30:50 2010 +0000

description:
Merge for libarchive-2.8.2.

diffstat:

 external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (16 lines):

diff -r 7ad2dd6afff1 -r 2b5e705ff959 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       Sun Mar 14 19:19:45 2010 +0000
+++ b/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c       Sun Mar 14 19:30:50 2010 +0000
@@ -208,6 +208,12 @@
 #if HAVE_ACL_GET_LINK_NP
        else if (!a->follow_symlinks)
                acl = acl_get_link_np(accpath, ACL_TYPE_ACCESS);
+#else
+       else if ((!a->follow_symlinks)
+           && (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;
 #endif
        else
                acl = acl_get_file(accpath, ACL_TYPE_ACCESS);