From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 1 May 2010 16:44:25 +0000 (-0400)
Subject: test cpio -0
X-Git-Tag: v3.0.0a~1047
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21147fb12695cb3cad0079973927cac068b41ed5;p=thirdparty%2Flibarchive.git

test cpio -0

SVN-Revision: 2346
---

diff --git a/Makefile.am b/Makefile.am
index 656c2990c..573ea7b13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -605,6 +605,7 @@ bsdcpio_test_SOURCES=						\
 	cpio/test/test_cmdline.c				\
 	cpio/test/test_format_newc.c				\
 	cpio/test/test_gcpio_compat.c				\
+	cpio/test/test_option_0.c				\
 	cpio/test/test_option_B_upper.c				\
 	cpio/test/test_option_C_upper.c				\
 	cpio/test/test_option_J_upper.c				\
diff --git a/cpio/test/CMakeLists.txt b/cpio/test/CMakeLists.txt
index a822bcdfb..9e7a0f3e8 100644
--- a/cpio/test/CMakeLists.txt
+++ b/cpio/test/CMakeLists.txt
@@ -15,6 +15,7 @@ IF(ENABLE_CPIO AND ENABLE_TEST)
     test_cmdline.c
     test_format_newc.c
     test_gcpio_compat.c
+    test_option_0.c
     test_option_B_upper.c
     test_option_C_upper.c
     test_option_J_upper.c
diff --git a/cpio/test/test_option_0.c b/cpio/test/test_option_0.c
new file mode 100644
index 000000000..7f625dfdf
--- /dev/null
+++ b/cpio/test/test_option_0.c
@@ -0,0 +1,92 @@
+/*-
+ * Copyright (c) 2003-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_0)
+{
+	FILE *filelist;
+	int r;
+
+	assertUmask(0);
+
+	/* Create a few files. */
+	assertMakeFile("file1", 0644, "1234567890");
+	assertMakeFile("file2", 0644, "1234567890");
+	assertMakeFile("file3", 0644, "1234567890");
+	assertMakeFile("file4", 0644, "1234567890");
+
+	/* Create a file list of filenames with varying end-of-line. */
+	filelist = fopen("filelist", "wb");
+	fwrite("file1\x0a", 1, 6, filelist);
+	fwrite("file2\x0d", 1, 6, filelist);
+	fwrite("file3\x0a\x0d", 1, 7, filelist);
+	fwrite("file4", 1, 5, filelist);
+	fclose(filelist);
+
+	/* Create a file list of null-delimited names. */
+	filelist = fopen("filelistNull", "wb");
+	fwrite("file1\0", 1, 6, filelist);
+	fwrite("file2\0", 1, 6, filelist);
+	fwrite("file3\0", 1, 6, filelist);
+	fwrite("file4", 1, 5, filelist);
+	fclose(filelist);
+
+	assertUmask(022);
+
+	/* Pack up using the file list with text line endings. */
+	r = systemf("%s -o < filelist > archive 2> stderr1.txt", testprog);
+	assertEqualInt(r, 0);
+
+	/* Extract into a new dir. */
+	assertMakeDir("copy", 0775);
+	assertChdir("copy");
+	r = systemf("%s -i < ../archive > stdout3.txt 2> stderr3.txt", testprog);
+	assertEqualInt(r, 0);
+
+	/* Verify the files. */
+	assertIsReg("file1", 0644);
+	assertIsReg("file2", 0644);
+	assertIsReg("file3", 0644);
+	assertIsReg("file4", 0644);
+
+	assertChdir("..");
+
+	/* Pack up using the file list with nulls. */
+	r = systemf("%s -o0 < filelistNull > archiveNull 2> stderr2.txt", testprog);
+	assertEqualInt(r, 0);
+
+	/* Extract into a new dir. */
+	assertMakeDir("copyNull", 0775);
+	assertChdir("copyNull");
+	r = systemf("%s -i < ../archiveNull > stdout4.txt 2> stderr4.txt", testprog);
+	assertEqualInt(r, 0);
+
+	/* Verify the files. */
+	assertIsReg("file1", 0644);
+	assertIsReg("file2", 0644);
+	assertIsReg("file3", 0644);
+	assertIsReg("file4", 0644);
+}