481c9003fa
libarchive: Fix include order in xxhash.c
...
We need to include `archive_platform.h` before any system headers in
order to ensure that `_WIN32_WINNT` is defined early enough.
2016-08-17 10:48:28 -04:00
52f58267c3
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2016-06-19 (139d0576)
2016-06-20 10:50:13 -04:00
e9bc469b2a
Merge branch 'upstream-LibArchive' into update-libarchive
...
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
2016-05-02 10:48:48 -04:00
49e82c15d5
Fix spelling typos in comments and documentation ( #16037 )
...
The Debian package checker tool (lintian) detected several typos in
CMake.
2016-03-29 14:31:02 -04:00
1e47381730
libarchive: Do not use pthread.h API without header
2015-10-28 08:44:47 -04:00
43d577dcb9
libarchive: Test for Clang builtin before using it
...
The __builtin_bswap16 builtin is not available on Clang 2.1.
2015-10-28 08:44:47 -04:00
85e0bb84f5
libarchive: Avoid using 'uint8_t' as bitfield type
...
The IBM XL compiler does not like it. Use plain 'unsigned' instead.
2015-10-22 10:18:27 -04:00
c70491d671
libarchive: Avoid using name 'hz'
...
AIX system headers define the symbol 'hz' as a preprocessor macro.
2015-10-22 10:18:27 -04:00
1bbba477c7
libarchive: Drop outdated CMake portability snprintf
...
The archive_read_support_format_zip.c source no longer calls snprintf
directly so we do not need a portability macro for it.
2015-10-22 10:18:26 -04:00
64bdf0b746
libarchive: Avoid non-portable u_int8_t
...
Use uint8_t that we prepare in config.h instead.
2015-10-22 10:18:26 -04:00
8f837fc9a9
libarchive: Use CommonCrypto APIs on OS X only when available
...
Use each CommonCrypto API only when using an OS X SDK version new enough
to provide it.
2015-10-22 10:18:26 -04:00
61a0251e82
libarchive: Define O_CLOEXEC when missing
...
Do this in archive_random.c as we do in several other sources already.
2015-10-22 10:18:26 -04:00
832fe4b133
libarchive: Fix VS 7.1 Debug build
...
This version of the MS C runtime library forgets to export
_byteswap_ushort.
2015-10-21 11:34:28 -04:00
0b82f51a30
libarchive: Guard bcyrpt.h with HAVE_BCRYPT_H
2015-10-21 11:18:50 -04:00
5333c04cd0
libarchive: Drop CMake-specific Borland compiler workaround
...
We no longer build CMake with the Borland compiler.
2015-10-21 10:31:57 -04:00
e861e12f6e
libarchive: Define version macro before first use
2015-10-21 10:30:29 -04:00
932848f420
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts by integrating changes from both sides.
2015-10-21 10:18:52 -04:00
8b4c40155a
Merge topic 'fix-libarchive-mktemp'
...
1f33b45d
2015-04-10 08:31:01 -04:00
ad194ae0b1
libarchive: Use base-256 encoding for UID/GID like GNU tar does
2015-04-09 14:27:16 -04:00
1f33b45d5d
libarchive: Fix string concatentation in Windows mktemp implementation
...
Port upstream LibArchive commit "compute string pointers after
concatenation" (2014-09-25) and commit "Move variables to top of
function for non-C99 compilers" (2014-11-15) to our CMake copy.
Otherwise we may compute a pointer to memory that is about to be freed
and then compute a bad size to give to CryptGenRandom.
Inspired-by: Tim Kientzle <kientzle@gmail.com>
2015-04-09 14:08:43 -04:00
6b9a0e1797
libarchive: Constify internal __archive_get_date implementation
...
The caller of this API already re-declares it as const, so update the
implementation accordingly.
2015-01-15 11:48:10 -05:00
bef23e8181
Fix some spelling errors in comments
2014-10-13 10:00:53 -04:00
8436d18115
CMake: Enable use of liblzma in libarchive ( #14504 )
...
Build liblzma as part of CMake or find one on the system. Modify our
port of libarchive to use the liblzma configured for use with CMake.
2014-07-29 08:45:36 -04:00
f56e74ef56
Merge topic 'hpux-libarchive-compile'
...
c1ddd77d
2014-06-09 10:36:13 -04:00
c1ddd77d0c
libarchive: Fix compilation on Tru64 with F_SETTIMES
...
The parent commit left a typo in the conditional code path for Tru64.
Add the missing '.'.
2014-06-09 10:36:41 -04:00
8c29d8d1e7
Merge topic 'hpux-libarchive-compile'
...
478b1c8b
2014-06-09 10:28:40 -04:00
478b1c8b36
libarchive: fix compilation on newer HP-UX versions
...
Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different
struct for the timing information.
Suggested-by: Eric Berge <ericmberge@gmail.com>
2014-06-09 10:15:27 -04:00
67f5f0a9fd
libarchive: Use _snprintf on Windows, not snprintf
2014-04-15 16:52:18 -04:00
4533560c23
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
2014-04-15 16:34:50 -04:00
6ab7c32648
libarchive: Avoid left-shift overflow of signed integer
...
In libarchive/archive_write_set_format_zip.c there are two calls to
archive_le32enc whose second argument is of the form
archive_entry_mode(zip->entry) << 16
However, the return type from archive_entry_mode may be a signed integer
so the shift may overflow. Since the second argument of archive_le32enc
expects uint32_t anyway, simply cast to that prior to shifting.
2014-04-15 09:08:20 -04:00
5a58efaac3
libarchive: Avoid using name 'u_long'
...
The system headers on some platforms define a 'u_long' type so we cannot
use the name. Spell out 'unsigned long' instead.
2014-04-11 09:01:27 -04:00
8088332178
libarchive: Do not require includers to have windows.h
...
In archive_entry.h refer to "BY_HANDLE_FILE_INFORMATION *" using
"struct _BY_HANDLE_FILE_INFORMATION *" to avoid requiring the
includer to already have <windows.h>.
2014-04-03 15:20:53 -04:00
dfb0458e5b
libarchive: Convert literal LL suffix to ARCHIVE_LITERAL_LL
2014-04-03 15:20:53 -04:00
b0a9807f39
libarchive: Update archive_util.c to use CMake zlib and bzip2 headers
2014-04-03 15:20:53 -04:00
2f1978632b
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts in favor of the upstream side where possible.
Resolve a logical conflict in archive_windows.h where the upstream
port to Watcom was done slightly differently from ours.
2014-04-03 15:02:49 -04:00
52285a993b
libarchive: Fix compliation with Open Watcom
2014-03-09 10:36:21 -04:00
9e41eb68ec
Fix wording of "the the" typos throughout text
2014-01-03 11:35:32 -05:00
0bff4df5f6
libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffix
...
The macro maps to an implementation that works on older compilers
when necessary.
2013-12-09 14:04:24 -05:00
61b39af353
libarchive: Port upstream issue 320 second fix
...
Port upstream commit 6cf33c93 (Issue 320: Rewrite (again) to avoid
the left shift that CLang dislikes so much, 2013-12-07) into CMake.
Inspired-by: Tim Kientzle <kientzle@freebsd.org>
2013-12-09 12:55:21 -05:00
5ee1297d6b
libarchive: Port upstream issue 320 fix
...
Port upstream commit 533e8fda (Rework the sign-extension to avoid
left-shift of an explicit negative number, 2013-06-29) into CMake.
Inspired-by: Tim Kientzle <kientzle@freebsd.org>
2013-11-25 11:16:45 -05:00
3218f52f11
libarchive: Avoid struct init with variable
...
Compilers such as Borland and MIPSpro do not like struct initialization
with variables. Initialize using assignment instead.
2013-07-31 08:20:24 -04:00
bae3a73cee
libarchive: Silence API deprecation warnings
...
CMake uses old libarchive APIs for now.
2013-07-31 08:20:05 -04:00
677384017a
libarchive: Include cm_zlib.h to get zlib used by CMake
...
Follow up change from commit ffa6faa4
2013-07-31 08:19:58 -04:00
102071f80c
Merge branch 'libarchive-upstream' into update-libarchive
...
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive.h
Utilities/cmlibarchive/libarchive/archive_entry.h
Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
Utilities/cmlibarchive/libarchive/archive_windows.h
Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
2013-07-31 08:19:13 -04:00
499531c64e
libarchive: Fix free() order to avoid accessing freed memory
...
The archive_string_conv type sc variable already freed via free(sc) on
the other hand in second line we are tyring to free its subset via
free(sc->from_charset) this will cause a problem because we couldn't
reach sc after first release.
Reviewed-by: Igor Murzov <e-mail@date.by>
2013-07-15 10:20:00 -04:00
bf019d765d
Fix spelling and typos (non-binary)
2013-05-07 08:39:19 -04:00
ddac8d3d2d
Fix spelling and typos (affecting binary data / module messages)
2013-05-07 08:39:19 -04:00
6a6a6f3670
libarchive: fixed undefined left shift with signed ints
...
caught by clang's -fsanitize=shift. A small unsigned int was
promoted, according to C's regular promotion rules, to a signed
int, it was then left shifted. This sometimes pushed a 1 into
the sign bit, which is undefined behaviour. Fixed by using
unsigned temporaries.
2012-11-30 08:04:48 -05:00
6c8722fab5
Fix typo direcotry -> directory (and similar) [ #13444 ]
2012-07-30 08:08:33 +02:00
54ffb5b4f1
libarchive: Avoid 'inline' on SunPro < 5.9 ( #13277 )
...
Suggested-by: Daniel R. Gomez <gomez@teragram.com>
2012-06-07 13:46:49 -04:00
Brad King
Felix Geyer
Nils Gladitz
Tim Kientzle
Geoff Viola
Daniel Pfeifer
Rolf Eike Beer
Jiri Malak
Ruslan Baratov
Ömer Fadıl USTA
Andreas Mohr
Sean McBride