Update libarchive to 3.4.2 Relevant vendor changes: PR #1289: atomic extraction support (bsdtar -x --safe-writes) PR #1308: big endian fix for UTF16 support in LHA reader PR #1326: reject RAR5 files that declare invalid header flags Issue #987: fix support 7z archive entries with Delta filter Issue #1317: fix compression output buffer handling in XAR writer Issue #1319: fix uname or gname longer than 32 characters in pax writer Issue #1325: fix use after free when archiving hardlinks in ISO9660 or XAR Use localtime_r() and gmtime_r() instead of localtime() and gmtime() X-MFC-With: r356212,r356365,r356416 MFC after: 1 week
136 lines
3.8 KiB
C
136 lines
3.8 KiB
C
/*-
|
|
* 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$");
|
|
|
|
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", ""); */
|
|
}
|