Test for a bug reported by Bernd Walter: In passthrough mode,
copying "dir/file" and then copying "dir" results in "File on disk is not older; skipping" for the "dir" because it was implicitly created by "dir/file." Among other sins, this means that "dir" ends up with the wrong permissions and ownership. This is actually a libarchive bug; fix is forthcoming.
This commit is contained in:
parent
2be5c100cf
commit
c9c5c49045
@ -27,7 +27,8 @@ TESTS= \
|
||||
test_option_y.c \
|
||||
test_option_z.c \
|
||||
test_owner_parse.c \
|
||||
test_pathmatch.c \
|
||||
test_passthrough_reverse.c \
|
||||
test_pathmatch.c
|
||||
|
||||
# Build the test program
|
||||
SRCS= list.h \
|
||||
|
@ -598,8 +598,8 @@ test_assert_file_contents(const void *buff, int s, const char *fpattern, ...)
|
||||
va_end(ap);
|
||||
|
||||
fd = open(f, O_RDONLY);
|
||||
contents = malloc(s * 2);
|
||||
n = read(fd, contents, s * 2);
|
||||
contents = malloc(s * 2 + 128);
|
||||
n = read(fd, contents, s * 2 + 128);
|
||||
if (n == s && memcmp(buff, contents, s) == 0) {
|
||||
free(contents);
|
||||
return (1);
|
||||
|
103
usr.bin/cpio/test/test_passthrough_reverse.c
Normal file
103
usr.bin/cpio/test/test_passthrough_reverse.c
Normal file
@ -0,0 +1,103 @@
|
||||
/*-
|
||||
* 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$");
|
||||
|
||||
/*
|
||||
* As reported by Bernd Walter: Some people are in the habit of
|
||||
* using "find -d" to generate a list for cpio -p because that
|
||||
* copies the top-level dir last, which preserves owner and mode
|
||||
* information. That's not necessary for bsdcpio (libarchive defers
|
||||
* restoring directory information), but bsdcpio should still generate
|
||||
* the correct results with this usage.
|
||||
*/
|
||||
|
||||
DEFINE_TEST(test_passthrough_reverse)
|
||||
{
|
||||
struct stat st;
|
||||
int fd, r;
|
||||
int filelist;
|
||||
int oldumask;
|
||||
|
||||
oldumask = umask(0);
|
||||
|
||||
/*
|
||||
* Create an assortment of files on disk.
|
||||
*/
|
||||
filelist = open("filelist", O_CREAT | O_WRONLY, 0644);
|
||||
|
||||
/* Directory. */
|
||||
assertEqualInt(0, mkdir("dir", 0743));
|
||||
|
||||
/* File with 10 bytes content. */
|
||||
fd = open("dir/file", O_CREAT | O_WRONLY, 0644);
|
||||
assert(fd >= 0);
|
||||
assertEqualInt(10, write(fd, "123456789", 10));
|
||||
close(fd);
|
||||
write(filelist, "dir/file\n", 9);
|
||||
|
||||
/* Write dir last. */
|
||||
write(filelist, "dir\n", 4);
|
||||
|
||||
/* All done. */
|
||||
close(filelist);
|
||||
|
||||
|
||||
/*
|
||||
* Use cpio passthrough mode to copy files to another directory.
|
||||
*/
|
||||
r = systemf("%s -pdvm out <filelist >stdout 2>stderr", testprog);
|
||||
failure("Error invoking %s -pd out", testprog);
|
||||
assertEqualInt(r, 0);
|
||||
|
||||
assertEqualInt(0, chdir("out"));
|
||||
|
||||
/* Verify stderr and stdout. */
|
||||
assertFileContents("out/dir/file\nout/dir\n", 21, "../stderr");
|
||||
assertEmptyFile("../stdout");
|
||||
|
||||
/* dir */
|
||||
r = lstat("dir", &st);
|
||||
if (r == 0) {
|
||||
assertEqualInt(r, 0);
|
||||
assert(S_ISDIR(st.st_mode));
|
||||
failure("st.st_mode=0%o", st.st_mode);
|
||||
assertEqualInt(0743, st.st_mode & 0777);
|
||||
}
|
||||
|
||||
|
||||
/* Regular file. */
|
||||
r = lstat("dir/file", &st);
|
||||
failure("Failed to stat dir/file, errno=%d", errno);
|
||||
assertEqualInt(r, 0);
|
||||
if (r == 0) {
|
||||
assert(S_ISREG(st.st_mode));
|
||||
assertEqualInt(0644, st.st_mode & 0777);
|
||||
assertEqualInt(10, st.st_size);
|
||||
assertEqualInt(1, st.st_nlink);
|
||||
}
|
||||
|
||||
umask(oldumask);
|
||||
}
|
Loading…
Reference in New Issue
Block a user