d21d99e07e
access to the file data (if the file exists on
disk). This was broken for the first regular
file; fix it and add a test so it won't break again.
In particular, this fixes the following idiom for creating
a tar archive in which every file is owned by root:
tar cf - --format=mtree . \
| sed -e 's/uname=[a-z]*/uname=root/' -e 's/uid=[0-9]*/uid=0/' \
| tar cf - @-
136 lines
4.9 KiB
C
136 lines
4.9 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$");
|
|
|
|
/* Single entry with a hardlink. */
|
|
static unsigned char archive[] = {
|
|
"#mtree\n"
|
|
"file type=file uid=18 mode=0123 size=3\n"
|
|
"dir type=dir\n"
|
|
" file\\040with\\040space type=file uid=18\n"
|
|
" ..\n"
|
|
"file\\04with\\040space type=file\n"
|
|
"dir2 type=dir\n"
|
|
" dir3a type=dir\n"
|
|
" indir3a type=file\n"
|
|
"dir2/fullindir2 type=file mode=0777\n"
|
|
" ..\n"
|
|
" indir2 type=file\n"
|
|
" dir3b type=dir\n"
|
|
" indir3b type=file\n"
|
|
" ..\n"
|
|
" ..\n"
|
|
"notindir type=file\n"
|
|
"dir2/fullindir2 mode=0644\n"
|
|
};
|
|
|
|
DEFINE_TEST(test_read_format_mtree)
|
|
{
|
|
char buff[16];
|
|
struct archive_entry *ae;
|
|
struct archive *a;
|
|
int fd;
|
|
|
|
/*
|
|
* An access error occurred on some platform when mtree
|
|
* format handling open a directory. It is for through
|
|
* the routine which open a directory that we create
|
|
* "dir" and "dir2" directories.
|
|
*/
|
|
assertEqualInt(0, mkdir("dir", 0775));
|
|
assertEqualInt(0, mkdir("dir2", 0775));
|
|
|
|
assert((a = archive_read_new()) != NULL);
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_support_compression_all(a));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_support_format_all(a));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_open_memory(a, archive, sizeof(archive)));
|
|
|
|
/*
|
|
* Read "file", whose data is available on disk.
|
|
*/
|
|
fd = open("file", O_WRONLY | O_CREAT, 0777);
|
|
assert(fd >= 0);
|
|
assertEqualInt(3, write(fd, "hi\n", 3));
|
|
close(fd);
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE);
|
|
assertEqualString(archive_entry_pathname(ae), "file");
|
|
assertEqualInt(archive_entry_uid(ae), 18);
|
|
assert(S_ISREG(archive_entry_mode(ae)));
|
|
assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0123);
|
|
assertEqualInt(archive_entry_size(ae), 3);
|
|
assertEqualInt(3, archive_read_data(a, buff, 3));
|
|
assertEqualMem(buff, "hi\n", 3);
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "dir");
|
|
assert(S_ISDIR(archive_entry_mode(ae)));
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "dir/file with space");
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "file\\04with space");
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "dir2");
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "dir2/dir3a");
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "dir2/dir3a/indir3a");
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "dir2/fullindir2");
|
|
assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0644);
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "dir2/indir2");
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "dir2/dir3b");
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "dir2/dir3b/indir3b");
|
|
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
|
|
assertEqualString(archive_entry_pathname(ae), "notindir");
|
|
|
|
assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
|
|
assertEqualInt(ARCHIVE_OK, archive_read_close(a));
|
|
#if ARCHIVE_VERSION_NUMBER < 2000000
|
|
archive_read_finish(a);
|
|
#else
|
|
assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
|
|
#endif
|
|
}
|
|
|
|
|