Bump bundled libarchive version to 3.5.2

- Update bunlded libarchive version used on Windows/Mac - Enable requested zstd support while we are at it. Closes #211
2025-05-19 16:35:20 +01:00 · 2021-12-09 12:22:14 +01:00 · 2021-12-09 12:22:14 +01:00 · 67618a2eac
commit 67618a2eac
parent 03e083b4f3
1869 changed files with 166685 additions and 9489 deletions
--- a/dependencies/libarchive-3.5.2/tar/test/test_basic.c
+++ b/dependencies/libarchive-3.5.2/tar/test/test_basic.c
@ -0,0 +1,135 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_basic.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
+
+static const char *
+make_files(void)
+{
+	FILE *f;
+
+	/* File with 10 bytes content. */
+	f = fopen("file", "wb");
+	assert(f != NULL);
+	assertEqualInt(10, fwrite("123456789", 1, 10, f));
+	fclose(f);
+
+	/* hardlink to above file. */
+	assertMakeHardlink("linkfile", "file");
+	assertIsHardlink("file", "linkfile");
+
+	/* Symlink to above file. */
+	if (canSymlink())
+		assertMakeSymlink("symlink", "file", 0);
+
+	/* Directory. */
+	assertMakeDir("dir", 0775);
+
+	return canSymlink()
+	    ? "file linkfile symlink dir"
+	    : "file linkfile dir";
+}
+
+static void
+verify_files(const char *target)
+{
+	assertChdir(target);
+
+	/* Regular file with 2 links. */
+	failure("%s", target);
+	assertIsReg("file", -1);
+	failure("%s", target);
+	assertFileSize("file", 10);
+	failure("%s", target);
+	assertFileContents("123456789", 10, "file");
+	failure("%s", target);
+	assertFileNLinks("file", 2);
+
+	/* Another name for the same file. */
+	failure("%s", target);
+	assertIsReg("linkfile", -1);
+	failure("%s", target);
+	assertFileSize("linkfile", 10);
+	assertFileContents("123456789", 10, "linkfile");
+	assertFileNLinks("linkfile", 2);
+	assertIsHardlink("file", "linkfile");
+
+	/* Symlink */
+	if (canSymlink())
+		assertIsSymlink("symlink", "file", 0);
+
+	/* dir */
+	failure("%s", target);
+	assertIsDir("dir", 0775);
+	assertChdir("..");
+}
+
+static void
+run_tar(const char *target, const char *pack_options,
+    const char *unpack_options, const char *flist)
+{
+	int r;
+
+	assertMakeDir(target, 0775);
+
+	/* Use the tar program to create an archive. */
+	r = systemf("%s cf - %s %s >%s/archive 2>%s/pack.err", testprog, pack_options, flist, target, target);
+	failure("Error invoking %s cf -%s", testprog, pack_options);
+	assertEqualInt(r, 0);
+
+	assertChdir(target);
+
+	/* Verify that nothing went to stderr. */
+	assertEmptyFile("pack.err");
+
+	/*
+	 * Use tar to unpack the archive into another directory.
+	 */
+	r = systemf("%s xf archive %s >unpack.out 2>unpack.err",
+	    testprog, unpack_options);
+	failure("Error invoking %s xf archive %s", testprog, unpack_options);
+	assertEqualInt(r, 0);
+
+	/* Verify that nothing went to stderr. */
+	assertEmptyFile("unpack.err");
+	assertChdir("..");
+}
+
+DEFINE_TEST(test_basic)
+{
+	const char *flist;
+
+	assertUmask(0);
+	flist = make_files();
+	/* Archive/dearchive with a variety of options. */
+	run_tar("copy", "", "", flist);
+	verify_files("copy");
+
+	run_tar("copy_ustar", "--format=ustar", "", flist);
+	verify_files("copy_ustar");
+
+	/* tar doesn't handle cpio symlinks correctly */
+	/* run_tar("copy_odc", "--format=odc", ""); */
+}