Module Name: src
Committed By: joerg
Date: Sun Mar 14 19:30:50 UTC 2010
Modified Files:
src/external/bsd/libarchive/dist/libarchive:
archive_read_disk_entry_from_file.c
Log Message:
Merge for libarchive-2.8.2.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c:1.2 src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c:1.3
--- src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c:1.2 Sat Feb 20 02:53:09 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c Sun Mar 14 19:30:50 2010
@@ -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);
