107df8e650
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2020-12-26 (227a4b97)
2021-08-24 10:13:10 -04:00
5d8b3aec0c
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2020-02-11 (3288ebb0)
Also manually restore content from upstream libarchive's main
`CMakeLists.txt` file that was removed by previous commits and
exclude it with `IF(0)` blocks. Do this as an evil merge so
that `git blame -C` can follow the content to upstream.
2020-02-13 12:57:52 -05:00
16e31523ba
libarchive: Add support for UTF-8 locale on Windows
...
Backport libarchive upstream commit `c46e7993` (windows: Support UTF-8
locale, 2018-07-23, v3.4.0~105^2).
Fixes : #20320
2020-02-06 15:04:47 -05:00
f7c54d2049
libarchive: Fix WideCharToMultiByte output buffer size
...
Fix `archive_string_append_from_wcs_in_codepage` to account for the
already-used portion of the buffer when computing the size of the
remaining buffer for ``WideCharToMultiByte` output.
2020-02-06 15:04:47 -05:00
6a4b1006f9
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2018-09-03 (5fe69dd0)
2018-09-26 09:53:15 -04:00
6df1bda1c5
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2017-07-09 (98a69539)
2017-07-20 11:36:18 -04:00
a59a7ee956
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2017-02-19 (100ee75a)
2017-02-20 08:04:00 -05: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
932848f420
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts by integrating changes from both sides.
2015-10-21 10:18:52 -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
156cb3bbf2
Merge branch 'libarchive-upstream' into update-libarchive
...
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive_windows.c
2012-01-05 09:02:58 -05:00
680fc0eda8
libarchive: Fix var decl after statement in archive_string.c
...
When HAVE_MBRTOWC is true we declare an extra local variable. Move the
unused argument cast to the end of the invalid_mbs function.
2011-12-23 16:04:59 -05:00
3e5a80f063
Merge branch 'libarchive-upstream' into update-libarchive
...
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
2011-12-20 11:54:25 -05:00
f6ac86d70e
libarchive: Remove our copy to make room for new import
2011-12-20 11:47:27 -05:00
8111b06078
Fix hpux build on heart
2009-11-06 12:13:36 -05:00
fb51d98562
Switch to using libarchive from libtar for cpack and cmake -E tar
...
This allows for a built in bzip and zip capability, so external tools
will not be needed for these packagers. The cmake -E tar xf should be
able to handle all compression types now as well.
2009-10-30 13:10:56 -04:00
Brad King