| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
We need to include `archive_platform.h` before any system headers in
order to ensure that `_WIN32_WINNT` is defined early enough.
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2016-06-19 (139d0576)
|
|
|
|
|
| |
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
|
|
|
|
|
| |
The Debian package checker tool (lintian) detected several typos in
CMake.
|
| |
|
|
|
|
| |
The __builtin_bswap16 builtin is not available on Clang 2.1.
|
|
|
|
| |
The IBM XL compiler does not like it. Use plain 'unsigned' instead.
|
|
|
|
| |
AIX system headers define the symbol 'hz' as a preprocessor macro.
|
|
|
|
|
| |
The archive_read_support_format_zip.c source no longer calls snprintf
directly so we do not need a portability macro for it.
|
|
|
|
| |
Use uint8_t that we prepare in config.h instead.
|
|
|
|
|
| |
Use each CommonCrypto API only when using an OS X SDK version new enough
to provide it.
|
|
|
|
| |
Do this in archive_random.c as we do in several other sources already.
|
|
|
|
|
| |
This version of the MS C runtime library forgets to export
_byteswap_ushort.
|
| |
|
|
|
|
| |
We no longer build CMake with the Borland compiler.
|
| |
|
|
|
|
| |
Resolve conflicts by integrating changes from both sides.
|
|\
| |
| |
| |
| | |
1f33b45d 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>
|
|/ |
|
|
|
|
|
| |
The caller of this API already re-declares it as const, so update the
implementation accordingly.
|
| |
|
|
|
|
|
| |
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.
|
|\
| |
| |
| |
| | |
c1ddd77d libarchive: Fix compilation on Tru64 with F_SETTIMES
|
| |
| |
| |
| |
| | |
The parent commit left a typo in the conditional code path for Tru64.
Add the missing '.'.
|
|\ \
| |/
| |
| |
| | |
478b1c8b 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>
|
| | |
|
| |
| |
| |
| |
| | |
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| | |
The system headers on some platforms define a 'u_long' type so we cannot
use the name. Spell out 'unsigned long' instead.
|
| |
| |
| |
| |
| |
| | |
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>.
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
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.
|
|/ |
|
| |
|
|
|
|
|
| |
The macro maps to an implementation that works on older compilers
when necessary.
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Compilers such as Borland and MIPSpro do not like struct initialization
with variables. Initialize using assignment instead.
|
|
|
|
| |
CMake uses old libarchive APIs for now.
|
|
|
|
|
|
| |
Follow up change from commit ffa6faa4 (libarchive: Include cm_zlib.h to
get zlib used by CMake, 2011-12-20) for new includes of zlib.h in
updated 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
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
Suggested-by: Daniel R. Gomez <gomez@teragram.com>
|