diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-21 14:12:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-21 14:18:52 (GMT) |
| commit | 932848f420a738ee07997198fead5b2c2fbf4787 (patch) | |
| tree | 40404c3244ba87c5e71e8dd076f4dbcde6d8cfeb /Utilities/cmlibarchive/libarchive/archive_write_disk_windows.c | |
| parent | e4b7d5afde91efafb59749a0a513732a089a6f0a (diff) | |
| parent | 1a8c7bc2c649781d1163c1966245a45e0fb829ba (diff) | |
| download | CMake-932848f420a738ee07997198fead5b2c2fbf4787.zip CMake-932848f420a738ee07997198fead5b2c2fbf4787.tar.gz CMake-932848f420a738ee07997198fead5b2c2fbf4787.tar.bz2 | |
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts by integrating changes from both sides.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_write_disk_windows.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_write_disk_windows.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_disk_windows.c b/Utilities/cmlibarchive/libarchive/archive_write_disk_windows.c index ed62009..800aa89 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_disk_windows.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_disk_windows.c @@ -330,8 +330,6 @@ file_information(struct archive_write_disk *a, wchar_t *path, break; case L'C': case L'c': if (((p[2] == L'M' || p[2] == L'm' ) && - (p[3] == L'D' || p[3] == L'd' )) || - ((p[2] == L'M' || p[2] == L'm' ) && (p[3] == L'D' || p[3] == L'd' ))) *mode |= S_IXUSR | S_IXGRP | S_IXOTH; break; @@ -1011,7 +1009,11 @@ _archive_write_disk_data_block(struct archive *_a, "Write request too large"); return (ARCHIVE_WARN); } +#if ARCHIVE_VERSION_NUMBER < 3999000 return (ARCHIVE_OK); +#else + return (size); +#endif } static ssize_t |