diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-07-24 05:42:43 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-05-04 11:53:07 +0000 |
| commit | cd09ca5e71a541c47752782d0b710bc95d97cbef (patch) | |
| tree | 2ff5fbb504c7e48d1fc9553bfeb20f7cfcf614d2 /contrib/libarchive/libarchive/archive_read_support_format_xar.c | |
| parent | d2291dbb3ccbb772fdeb9fdae88602771564e607 (diff) | |
| download | src-cd09ca5e71a541c47752782d0b710bc95d97cbef.tar.gz src-cd09ca5e71a541c47752782d0b710bc95d97cbef.zip | |
libarchive: merge from vendor branch
Libarchive 3.7.0
Important changes (relevant to FreeBSD):
#1814 Do not account for NULL terminator when comparing with "TRAILER!!!"
#1818 Add ability to produce multi-frame zstd archives
#1840 year 2038 fix for pax archives on platforms with 64-bit time_t
#1860 Make single bit bitfields unsigned to avoid clang 16 warning
#1869 Fix FreeBSD builds with WARNS=6
#1873 bsdunzip ported to libarchive from FreeBSD
#1894 read support for zstd compression in 7zip archives
#1918 ARM64 filter support in 7zip archives
(cherry picked from commit e64fe029e9d3ce476e77a478318e0c3cd201ff08)
Diffstat (limited to 'contrib/libarchive/libarchive/archive_read_support_format_xar.c')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_read_support_format_xar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/libarchive/libarchive/archive_read_support_format_xar.c b/contrib/libarchive/libarchive/archive_read_support_format_xar.c index ec5b06edacd5..ec9cb1981f3d 100644 --- a/contrib/libarchive/libarchive/archive_read_support_format_xar.c +++ b/contrib/libarchive/libarchive/archive_read_support_format_xar.c @@ -1127,7 +1127,7 @@ atohex(unsigned char *b, size_t bsize, const char *p, size_t psize) x |= p[1] - '0'; else return (-1); - + *b++ = x; bsize--; p += 2; @@ -1139,11 +1139,11 @@ atohex(unsigned char *b, size_t bsize, const char *p, size_t psize) static time_t time_from_tm(struct tm *t) { -#if HAVE_TIMEGM +#if HAVE__MKGMTIME + return _mkgmtime(t); +#elif HAVE_TIMEGM /* Use platform timegm() if available. */ return (timegm(t)); -#elif HAVE__MKGMTIME64 - return (_mkgmtime64(t)); #else /* Else use direct calculation using POSIX assumptions. */ /* First, fix up tm_yday based on the year/month/day. */ |