52c2bb7516
Sync libarchive with vendor. Relevant vendor changes: Issue #795: XAR - do not try to add xattrs without an allocated name PR #812: non-recursive option for extract and list PR #958: support reading metadata from compressed files PR #999: add --exclude-vcs option to bsdtar Issue #1062: treat empty archives with a GNU volume header as valid PR #1074: Handle ZIP files with trailing 0s in the extra fields (Android APK archives) PR #1109: Ignore padding in Zip extra field data (Android APK archives) PR #1167: fix problems related to unreadable directories Issue #1168: fix handling of strtol() and strtoul() PR #1172: RAR5 - fix invalid window buffer read in E8E9 filter PR #1174: ZIP reader - fix of MSZIP signature parsing PR #1175: gzip filter - fix reading files larger than 4GB from memory PR #1177: gzip filter - fix memory leak with repeated header reads PR #1180: ZIP reader - add support for Info-ZIP Unicode Path Extra Field PR #1181: RAR5 - fix merge_block() recursion (OSS-Fuzz 12999, 13029, 13144, 13478, 13490) PR #1183: fix memory leak when decompressing ZIP files with LZMA PR #1184: fix RAR5 OSS-Fuzz issues 12466, 14490, 14491, 12817 OSS-Fuzz 12466: RAR5 - fix buffer overflow when parsing huffman tables OSS-Fuzz 14490, 14491: RAR5 - fix bad shift-left operations OSS-Fuzz 12817: RAR5 - handle a case with truncated huffman tables PR #1186: RAR5 - fix invalid type used for dictionary size mask (OSS-Fuzz 14537) PR #1187: RAR5 - fix integer overflow (OSS-Fuzz 14555) PR #1190: RAR5 - RAR5 don't try to unpack entries marked as directories (OSS-Fuzz 14574) PR #1196: RAR5 - fix a potential SIGSEGV on 32-bit builds OSS-Fuzz 2582: RAR - fix use after free if there is an invalid entry OSS-Fuzz 14331: RAR5 - fix maximum owner name length OSS-Fuzz 13965: RAR5 - use unsigned int for volume number + range check Additional RAR5 reader changes: - support symlinks, hardlinks, file owner, file group, versioned files - change ARCHIVE_FORMAT_RAR_V5 to 0x100000 - set correct mode for readonly directories - support readonly, hidden and system Windows file attributes MFC after: 2 weeks
93 lines
3.4 KiB
C
93 lines
3.4 KiB
C
/*-
|
|
* Copyright (c) 2010 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$");
|
|
|
|
DEFINE_TEST(test_option_H_upper)
|
|
{
|
|
|
|
if (!canSymlink()) {
|
|
skipping("Can't test symlinks on this filesystem");
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Create a sample archive.
|
|
*/
|
|
assertMakeDir("in", 0755);
|
|
assertChdir("in");
|
|
assertMakeDir("d1", 0755);
|
|
assertMakeSymlink("ld1", "d1", 1);
|
|
assertMakeFile("d1/file1", 0644, "d1/file1");
|
|
assertMakeFile("d1/file2", 0644, "d1/file2");
|
|
assertMakeSymlink("d1/link1", "file1", 0);
|
|
assertMakeSymlink("d1/linkX", "fileX", 0);
|
|
assertMakeSymlink("link2", "d1/file2", 0);
|
|
assertMakeSymlink("linkY", "d1/fileY", 0);
|
|
assertChdir("..");
|
|
|
|
/* Test 1: Without -H */
|
|
assertMakeDir("test1", 0755);
|
|
assertEqualInt(0,
|
|
systemf("%s -cf test1/archive.tar -C in . >test1/c.out 2>test1/c.err", testprog));
|
|
assertChdir("test1");
|
|
assertEqualInt(0,
|
|
systemf("%s -xf archive.tar >c.out 2>c.err", testprog));
|
|
assertIsSymlink("ld1", "d1", 1);
|
|
assertIsSymlink("d1/link1", "file1", 0);
|
|
assertIsSymlink("d1/linkX", "fileX", 0);
|
|
assertIsSymlink("link2", "d1/file2", 0);
|
|
assertIsSymlink("linkY", "d1/fileY", 0);
|
|
assertChdir("..");
|
|
|
|
/* Test 2: With -H, no symlink on command line. */
|
|
assertMakeDir("test2", 0755);
|
|
assertEqualInt(0,
|
|
systemf("%s -cf test2/archive.tar -H -C in . >test2/c.out 2>test2/c.err", testprog));
|
|
assertChdir("test2");
|
|
assertEqualInt(0,
|
|
systemf("%s -xf archive.tar >c.out 2>c.err", testprog));
|
|
assertIsSymlink("ld1", "d1", 1);
|
|
assertIsSymlink("d1/link1", "file1", 0);
|
|
assertIsSymlink("d1/linkX", "fileX", 0);
|
|
assertIsSymlink("link2", "d1/file2", 0);
|
|
assertIsSymlink("linkY", "d1/fileY", 0);
|
|
assertChdir("..");
|
|
|
|
/* Test 3: With -H, some symlinks on command line. */
|
|
assertMakeDir("test3", 0755);
|
|
assertEqualInt(0,
|
|
systemf("%s -cf test3/archive.tar -H -C in ld1 d1 link2 linkY >test2/c.out 2>test2/c.err", testprog));
|
|
assertChdir("test3");
|
|
assertEqualInt(0,
|
|
systemf("%s -xf archive.tar >c.out 2>c.err", testprog));
|
|
assertIsDir("ld1", umasked(0755));
|
|
assertIsSymlink("d1/linkX", "fileX", 0);
|
|
assertIsSymlink("d1/link1", "file1", 0);
|
|
assertIsReg("link2", umasked(0644));
|
|
assertIsSymlink("linkY", "d1/fileY", 0);
|
|
assertChdir("..");
|
|
}
|