git: d91bfe0fb7fa - main - libarchive: merge from vendor branch

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Martin Matuska <mm_at_FreeBSD.org>
Date: Mon, 31 Jul 2023 11:15:58 UTC

The branch main has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4

commit d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4
Merge: 896809e29675 f8035ed8e513
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2023-07-31 11:13:30 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2023-07-31 11:15:12 +0000

    libarchive: merge from vendor branch
    
    Changes to not yet connected unzip only.
    
    MFC after:      1 week

 contrib/libarchive/cat/cmdline.c             |  12 +-
 contrib/libarchive/unzip/bsdunzip.c          |  66 +++++--
 contrib/libarchive/unzip/bsdunzip.h          |  63 +++++++
 contrib/libarchive/unzip/cmdline.c           | 250 +++++++++++++++++++++++++++
 contrib/libarchive/unzip/test/test.h         |   2 +-
 contrib/libarchive/unzip/test/test_version.c |  34 ++++
 6 files changed, 402 insertions(+), 25 deletions(-)

diff --cc contrib/libarchive/unzip/bsdunzip.h
index 000000000000,12b65cefb466..12b65cefb466
mode 000000,100644..100644
--- a/contrib/libarchive/unzip/bsdunzip.h
+++ b/contrib/libarchive/unzip/bsdunzip.h
diff --cc contrib/libarchive/unzip/cmdline.c
index 000000000000,95d4f99b8242..95d4f99b8242
mode 000000,100644..100644
--- a/contrib/libarchive/unzip/cmdline.c
+++ b/contrib/libarchive/unzip/cmdline.c
diff --cc contrib/libarchive/unzip/test/test_version.c
index 000000000000,efa797982d57..efa797982d57
mode 000000,100644..100644
--- a/contrib/libarchive/unzip/test/test_version.c
+++ b/contrib/libarchive/unzip/test/test_version.c