diff options
| author | mm <mm@FreeBSD.org> | 2016-07-08 10:06:02 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2016-07-08 10:06:02 +0000 |
| commit | 16c0960d90bdc939870e66079969fddf861e7d6e (patch) | |
| tree | 358933bdb6c86e2b0a077c5b503f7ded5fd5341a /contrib/libarchive/libarchive/archive_write_disk_posix.c | |
| parent | d2c3585acea931bc4345759421537448a8a0ccd0 (diff) | |
| download | FreeBSD-src-16c0960d90bdc939870e66079969fddf861e7d6e.zip FreeBSD-src-16c0960d90bdc939870e66079969fddf861e7d6e.tar.gz | |
MFC r302294:
Sync libarchive with vendor, bugfixes for tests:
- fix tests on filesystems without birthtime support, e.g. UFS1 (1)
- vendor issue #729: avoid use of C99 for-scope declarations in
test_write_format_gnutar_filenames.c
PR: 204157 (1)
Diffstat (limited to 'contrib/libarchive/libarchive/archive_write_disk_posix.c')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_write_disk_posix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/libarchive/libarchive/archive_write_disk_posix.c b/contrib/libarchive/libarchive/archive_write_disk_posix.c index bd0e80a..74c7f6a 100644 --- a/contrib/libarchive/libarchive/archive_write_disk_posix.c +++ b/contrib/libarchive/libarchive/archive_write_disk_posix.c @@ -3487,6 +3487,9 @@ exit_xattr: static int copy_acls(struct archive_write_disk *a, int tmpfd, int dffd) { +#ifndef HAVE_SYS_ACL_H + return 0; +#else acl_t acl, dfacl = NULL; int acl_r, ret = ARCHIVE_OK; @@ -3514,6 +3517,7 @@ exit_acl: if (dfacl) acl_free(dfacl); return (ret); +#endif } static int |
