Rebase libarchive to 2.8.0

1 files changed, 63 insertions, 0 deletions

diff --git a/libarchive/libarchive-2.8.0/cpio/test/test_option_m.c b/libarchive/libarchive-2.8.0/cpio/test/test_option_m.c
new file mode 100644
index 0000000..de880b2
--- /dev/null
+++ b/libarchive/libarchive-2.8.0/cpio/test/test_option_m.c
@@ -0,0 +1,63 @@
+/*-
+ * 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$");
+
+
+DEFINE_TEST(test_option_m)
+{
+	int r;
+
+	/*
+	 * The reference archive has one file with an mtime in 1970, 1
+	 * second after the start of the epoch.
+	 */
+
+	/* Restored without -m, the result should have a current mtime. */
+	assertMakeDir("without-m", 0755);
+	assertChdir("without-m");
+	extract_reference_file("test_option_m.cpio");
+	r = systemf("%s --no-preserve-owner -i < test_option_m.cpio >out 2>err", testprog);
+	assertEqualInt(r, 0);
+	assertEmptyFile("out");
+	assertTextFileContents("1 block\n", "err");
+	/* Should have been created within the last few seconds. */
+	assertFileMtimeRecent("file");
+
+	/* With -m, it should have an mtime in 1970. */
+	assertChdir("..");
+	assertMakeDir("with-m", 0755);
+	assertChdir("with-m");
+	extract_reference_file("test_option_m.cpio");
+	r = systemf("%s --no-preserve-owner -im < test_option_m.cpio >out 2>err", testprog);
+	assertEqualInt(r, 0);
+	assertEmptyFile("out");
+	assertTextFileContents("1 block\n", "err");
+	/*
+	 * mtime in reference archive is '1' == 1 second after
+	 * midnight Jan 1, 1970 UTC.
+	 */
+	assertFileMtime("file", 1, 0);
+}