Test for tar -U and documentation corrections.

SVN-Revision: 2241

diff --git a/Makefile.am b/Makefile.am
index 03e4e94386e70c754b2db28d3c9e302fa7b53ab9..330ebf423ac07372829eb3b7595403d19ad3cd4f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -488,6 +488,7 @@ bsdtar_test_SOURCES=                                                \
        tar/test/test_option_L_upper.c                          \
        tar/test/test_option_O_upper.c                          \
        tar/test/test_option_T_upper.c                          \
+       tar/test/test_option_U_upper.c                          \
        tar/test/test_option_X_upper.c                          \
        tar/test/test_option_b.c                                \
        tar/test/test_option_exclude.c                          \

diff --git a/tar/bsdtar.1 b/tar/bsdtar.1
index 8cbc6bf1f7b3f30c80b95c7e4671567531942819..4037e8becb4ad93bfca90c3165cc46a277897149 100644 (file)
--- a/tar/bsdtar.1
+++ b/tar/bsdtar.1
@@ -536,11 +536,14 @@ After archiving all files, print a summary to stderr.
 .It Fl U , Fl Fl unlink , Fl Fl unlink-first
 (x mode only)
 Unlink files before creating them.
-Without this option,
+This can be a minor performance optimization if most files
+already exist, but can make things slower if most files
+do not already exist.
+This flag also causes
 .Nm
-overwrites existing files, which preserves existing hardlinks.
-With this option, existing hardlinks will be broken, as will any
-symlink that would affect the location of an extracted file.
+to remove intervening directory symlinks instead of
+reporting an error.
+See the SECURITY section below for more details.
 .It Fl Fl use-compress-program Ar program
 Pipe the input (in x or t mode) or the output (in c mode) through
 .Pa program

diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index e8b2eb738015333a180f2b7a22cffb51918312ee..d38dcdacb302735cd0ac4b5a9a86ba601c2e5641 100644 (file)
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -19,6 +19,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     test_option_L_upper.c
     test_option_O_upper.c
     test_option_T_upper.c
+    test_option_U_upper.c
     test_option_X_upper.c
     test_option_b.c
     test_option_exclude.c

diff --git a/tar/test/test_option_U_upper.c b/tar/test/test_option_U_upper.c
new file mode 100644 (file)
index 0000000..4d77cb0
--- /dev/null
+++ b/tar/test/test_option_U_upper.c
@@ -0,0 +1,159 @@
+/*-
+ * Copyright (c) 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_U_upper)
+{
+       int r;
+
+       assertMakeFile("file1", 0644, "file1");
+       assertMakeDir("d1", 0755);
+       assertMakeFile("d1/file1", 0644, "d1/file1");
+       assertEqualInt(0, systemf("%s -cf archive.tar file1 d1/file1", testprog));
+
+       /*
+        * bsdtar's man page used to claim that -x without -U would
+        * not break hard links.  This was and is nonsense.  The first
+        * two tests here simply verify that existing hard links get
+        * broken regardless.
+        */
+
+       /* Test 1: -x without -U */
+       assertMakeDir("test1", 0755);
+       assertChdir("test1");
+       assertMakeFile("file1", 0644, "file1new");
+       assertMakeHardlink("file2", "file1");
+       assertEqualInt(0,
+           systemf("%s -xf ../archive.tar >test.out 2>test.err", testprog));
+       assertFileContents("file1", 5, "file1");
+       assertFileContents("file1new", 8, "file2");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+
+
+       /* Test 2: -x with -U */
+       assertMakeDir("test2", 0755);
+       assertChdir("test2");
+       assertMakeFile("file1", 0644, "file1new");
+       assertMakeHardlink("file2", "file1");
+       assertEqualInt(0,
+           systemf("%s -xUf ../archive.tar >test.out 2>test.err", testprog));
+       assertFileContents("file1", 5, "file1");
+       assertFileContents("file1new", 8, "file2");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+
+       /*
+        * -U does make a difference in how bsdtar handles unwanted symlinks,
+        * though.  It interacts with -P.
+        */
+       if (!canSymlink())
+               return;
+
+       /* Test 3: Intermediate dir symlink causes error by default */
+       assertMakeDir("test3", 0755);
+       assertChdir("test3");
+       assertMakeDir("realDir", 0755);
+       assertMakeSymlink("d1", "realDir");
+       r = systemf("%s -xf ../archive.tar d1/file1 >test.out 2>test.err", testprog);
+       assert(r != 0);
+       assertIsSymlink("d1", "realDir");
+       assertFileNotExists("d1/file1");
+       assertEmptyFile("test.out");
+       assertNonEmptyFile("test.err");
+       assertChdir("..");
+
+       /* Test 4: Intermediate dir symlink gets removed with -U */
+       assertMakeDir("test4", 0755);
+       assertChdir("test4");
+       assertMakeDir("realDir", 0755);
+       assertMakeSymlink("d1", "realDir");
+       assertEqualInt(0,
+           systemf("%s -xUf ../archive.tar >test.out 2>test.err", testprog));
+       assertIsDir("d1", -1);
+       assertFileContents("d1/file1", 8, "d1/file1");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+
+       /* Test 5: Intermediate dir symlink is followed with -P */
+       assertMakeDir("test5", 0755);
+       assertChdir("test5");
+       assertMakeDir("realDir", 0755);
+       assertMakeSymlink("d1", "realDir");
+       assertEqualInt(0,
+           systemf("%s -xPf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
+       assertIsSymlink("d1", "realDir");
+       assertFileContents("d1/file1", 8, "d1/file1");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+
+       /* Test 6: Intermediate dir symlink is followed with -PU */
+       assertMakeDir("test6", 0755);
+       assertChdir("test6");
+       assertMakeDir("realDir", 0755);
+       assertMakeSymlink("d1", "realDir");
+       assertEqualInt(0,
+           systemf("%s -xPUf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
+       assertIsSymlink("d1", "realDir");
+       assertFileContents("d1/file1", 8, "d1/file1");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+
+       /* Test 7: Final file symlink replaced by default */
+       assertMakeDir("test7", 0755);
+       assertChdir("test7");
+       assertMakeDir("d1", 0755);
+       assertMakeFile("d1/realfile1", 0644, "realfile1");
+       assertMakeSymlink("d1/file1", "d1/realfile1");
+       assertEqualInt(0,
+           systemf("%s -xf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
+       assertIsReg("d1/file1", 0644);
+       assertFileContents("d1/file1", 8, "d1/file1");
+       assertFileContents("realfile1", 9, "d1/realfile1");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+
+       /* Test 8: Final file symlink replaced with -PU */
+       assertMakeDir("test8", 0755);
+       assertChdir("test8");
+       assertMakeDir("d1", 0755);
+       assertMakeFile("d1/realfile1", 0644, "realfile1");
+       assertMakeSymlink("d1/file1", "d1/realfile1");
+       assertEqualInt(0,
+           systemf("%s -xPUf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
+       assertIsReg("d1/file1", 0644);
+       assertFileContents("d1/file1", 8, "d1/file1");
+       assertFileContents("realfile1", 9, "d1/realfile1");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+}