Module Name: src
Committed By: joerg
Date: Wed Jul 14 22:13:58 UTC 2010
Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_read.3
archive_read_disk_entry_from_file.c
Log Message:
Merge libarchive 2.8.4
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/libarchive/archive_read.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.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read.3:1.3 src/external/bsd/libarchive/dist/libarchive/archive_read.3:1.4
--- src/external/bsd/libarchive/dist/libarchive/archive_read.3:1.3 Sat Feb 20 02:51:33 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_read.3 Wed Jul 14 22:13:58 2010
@@ -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);
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.3 src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c:1.4
--- src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c:1.3 Sun Mar 14 19:30:50 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c Wed Jul 14 22:13:58 2010
@@ -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.
