6c95142e79
Some of new features:
- New readers: RAR, LHA/LZH, CAB reader, 7-Zip
- New writers: ISO9660, XAR
- Improvements to many formats, especially including ISO9660 and Zip
- Stackable write filters to write, e.g., tar.gz.uu in a single pass
- Exploit seekable input; new "seekable" Zip reader can exploit the Zip
Central Directory when it's available; the old "streamable" Zip reader
is still fully supported for cases where seeking is not possible.
Full release notes available at:
https://github.com/libarchive/libarchive/wiki/ReleaseNotes
131 lines
4.7 KiB
C
131 lines
4.7 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$");
|
|
|
|
/*
|
|
* Also see test_option_q for additional validation of -r support.
|
|
*/
|
|
DEFINE_TEST(test_option_r)
|
|
{
|
|
char *buff;
|
|
char *p0, *p1;
|
|
size_t buff_size = 35000;
|
|
size_t s, buff_size_rounded;
|
|
int r, i;
|
|
|
|
/* Create an archive with one file. */
|
|
assertMakeFile("f1", 0644, "abc");
|
|
r = systemf("%s cf archive.tar --format=ustar f1 >step1.out 2>step1.err", testprog);
|
|
failure("Error invoking %s cf archive.tar f1", testprog);
|
|
assertEqualInt(r, 0);
|
|
assertEmptyFile("step1.out");
|
|
assertEmptyFile("step1.err");
|
|
|
|
/* Do some basic validation of the constructed archive. */
|
|
p0 = slurpfile(&s, "archive.tar");
|
|
if (!assert(p0 != NULL))
|
|
return;
|
|
if (!assert(s >= 2048)) {
|
|
free(p0);
|
|
return;
|
|
}
|
|
assertEqualMem(p0 + 0, "f1", 3);
|
|
assertEqualMem(p0 + 512, "abc", 3);
|
|
assertEqualMem(p0 + 1024, "\0\0\0\0\0\0\0\0", 8);
|
|
assertEqualMem(p0 + 1536, "\0\0\0\0\0\0\0\0", 8);
|
|
|
|
/* Edit that file with a lot more data and update the archive with a new copy. */
|
|
buff = malloc(buff_size);
|
|
assert(buff != NULL);
|
|
for (i = 0; i < (int)buff_size; ++i)
|
|
buff[i] = "abcdefghijklmnopqrstuvwxyz"[rand() % 26];
|
|
buff[buff_size - 1] = '\0';
|
|
assertMakeFile("f1", 0644, buff);
|
|
r = systemf("%s rf archive.tar --format=ustar f1 >step2.out 2>step2.err", testprog);
|
|
failure("Error invoking %s rf archive.tar f1", testprog);
|
|
assertEqualInt(r, 0);
|
|
assertEmptyFile("step2.out");
|
|
assertEmptyFile("step2.err");
|
|
|
|
/* The constructed archive should just have the new entry appended. */
|
|
p1 = slurpfile(&s, "archive.tar");
|
|
if (!assert(p1 != NULL)) {
|
|
free(p0);
|
|
return;
|
|
}
|
|
buff_size_rounded = ((buff_size + 511) / 512) * 512;
|
|
assert(s >= 2560 + buff_size_rounded);
|
|
/* Verify first entry is unchanged. */
|
|
assertEqualMem(p0, p1, 1024);
|
|
/* Verify that second entry is correct. */
|
|
assertEqualMem(p1 + 1024, "f1", 3);
|
|
assertEqualMem(p1 + 1536, buff, buff_size);
|
|
/* Verify end-of-archive marker. */
|
|
assertEqualMem(p1 + 1536 + buff_size_rounded, "\0\0\0\0\0\0\0\0", 8);
|
|
assertEqualMem(p1 + 2048 + buff_size_rounded, "\0\0\0\0\0\0\0\0", 8);
|
|
|
|
free(p0);
|
|
p0 = p1;
|
|
|
|
/* Update the archive by adding a different file. */
|
|
assertMakeFile("f2", 0644, "f2");
|
|
r = systemf("%s rf archive.tar --format=ustar f2 >step3.out 2>step3.err", testprog);
|
|
failure("Error invoking %s rf archive.tar f2", testprog);
|
|
assertEqualInt(r, 0);
|
|
assertEmptyFile("step3.out");
|
|
assertEmptyFile("step3.err");
|
|
|
|
/* Validate the constructed archive. */
|
|
p1 = slurpfile(&s, "archive.tar");
|
|
if (!assert(p1 != NULL)) {
|
|
free(p0);
|
|
return;
|
|
}
|
|
assert(s >= 3584 + buff_size_rounded);
|
|
/* Verify first two entries are unchanged. */
|
|
assertEqualMem(p0, p1, 1536 + buff_size_rounded);
|
|
/* Verify that new entry is correct. */
|
|
assertEqualMem(p1 + 1536 + buff_size_rounded, "f2", 3);
|
|
assertEqualMem(p1 + 2048 + buff_size_rounded, "f2", 3);
|
|
/* Verify end-of-archive marker. */
|
|
assertEqualMem(p1 + 2560 + buff_size_rounded, "\0\0\0\0\0\0\0\0", 8);
|
|
assertEqualMem(p1 + 3072 + buff_size_rounded, "\0\0\0\0\0\0\0\0", 8);
|
|
free(p0);
|
|
free(p1);
|
|
|
|
/* Unpack everything */
|
|
assertMakeDir("extract", 0775);
|
|
assertChdir("extract");
|
|
r = systemf("%s xf ../archive.tar >extract.out 2>extract.err", testprog);
|
|
failure("Error invoking %s xf archive.tar", testprog);
|
|
assertEqualInt(r, 0);
|
|
assertEmptyFile("extract.out");
|
|
assertEmptyFile("extract.err");
|
|
|
|
/* Verify that the second copy of f1 overwrote the first. */
|
|
assertFileContents(buff, strlen(buff), "f1");
|
|
}
|