Fix tar -k by making it not an error if you specify

ARCHIVE_EXTRACT_NO_OVERWRITE and the file already exists.

SVN-Revision: 2238

diff --git a/Makefile.am b/Makefile.am
index 9208348f66624b395f95a1e4aa48a8aa63391aac..1b065fddc7f40e75f25abd3e7c486d58f58483d8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -490,6 +490,7 @@ bsdtar_test_SOURCES=                                                \
        tar/test/test_option_X_upper.c                          \
        tar/test/test_option_b.c                                \
        tar/test/test_option_exclude.c                          \
+       tar/test/test_option_k.c                                \
        tar/test/test_option_keep_newer.c                       \
        tar/test/test_option_q.c                                \
        tar/test/test_option_r.c                                \

diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
index bcc8dd41eaa5bda9fcbc56c4591d58973d00d560..28225d14166ac8c02a0d41ea5acf17cbb3aa0027 100644 (file)
--- a/libarchive/archive_write_disk.c
+++ b/libarchive/archive_write_disk.c
@@ -1035,8 +1035,8 @@ restore_entry(struct archive_write_disk *a)
        if ((en == EISDIR || en == EEXIST)
            && (a->flags & ARCHIVE_EXTRACT_NO_OVERWRITE)) {
                /* If we're not overwriting, we're done. */
-               archive_set_error(&a->archive, en, "Already exists");
-               return (ARCHIVE_FAILED);
+               archive_entry_unset_size(a->entry);
+               return (ARCHIVE_OK);
        }
 
        /*

diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index 183e22ad6dc0177e0968501981720d60a5215fb3..a99683650a7304bc123689b2c05660ae6e173cc2 100644 (file)
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -19,9 +19,10 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     test_option_L_upper.c
     test_option_T_upper.c
     test_option_X_upper.c
+    test_option_b.c
     test_option_exclude.c
+    test_option_k.c
     test_option_keep_newer.c
-    test_option_b.c
     test_option_q.c
     test_option_r.c
     test_option_s.c

diff --git a/tar/test/test_option_k.c b/tar/test/test_option_k.c
new file mode 100644 (file)
index 0000000..e57cc27
--- /dev/null
+++ b/tar/test/test_option_k.c
@@ -0,0 +1,107 @@
+/*-
+ * 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_k)
+{
+       /*
+        * Create an archive with a couple of different versions of the
+        * same file.
+        */
+
+       assertMakeFile("foo", 0644, "foo1");
+
+       assertEqualInt(0, systemf("%s -cf archive.tar foo", testprog));
+
+       assertMakeFile("foo", 0644, "foo2");
+
+       assertEqualInt(0, systemf("%s -rf archive.tar foo", testprog));
+
+       assertMakeFile("bar", 0644, "bar1");
+
+       assertEqualInt(0, systemf("%s -rf archive.tar bar", testprog));
+
+       assertMakeFile("foo", 0644, "foo3");
+
+       assertEqualInt(0, systemf("%s -rf archive.tar foo", testprog));
+
+       assertMakeFile("bar", 0644, "bar2");
+
+       assertEqualInt(0, systemf("%s -rf archive.tar bar", testprog));
+
+       /*
+        * Now, try extracting from the test archive with various
+        * combinations of -k
+        */
+
+       /* Test 1: No option */
+       assertMakeDir("test1", 0755);
+       assertChdir("test1");
+       assertEqualInt(0,
+           systemf("%s -xf ../archive.tar >test.out 2>test.err", testprog));
+       assertFileContents("foo3", 4, "foo");
+       assertFileContents("bar2", 4, "bar");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+
+       /* Test 2: With -k, we should just get the first versions. */
+       assertMakeDir("test2", 0755);
+       assertChdir("test2");
+       assertEqualInt(0,
+           systemf("%s -xf ../archive.tar -k >test.out 2>test.err", testprog));
+       assertFileContents("foo1", 4, "foo");
+       assertFileContents("bar1", 4, "bar");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+
+       /* Test 3: Without -k, existing files should get overwritten */
+       assertMakeDir("test3", 0755);
+       assertChdir("test3");
+       assertMakeFile("bar", 0644, "bar0");
+       assertMakeFile("foo", 0644, "foo0");
+       assertEqualInt(0,
+           systemf("%s -xf ../archive.tar >test.out 2>test.err", testprog));
+       assertFileContents("foo3", 4, "foo");
+       assertFileContents("bar2", 4, "bar");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+
+       /* Test 4: With -k, existing files should not get overwritten */
+       assertMakeDir("test4", 0755);
+       assertChdir("test4");
+       assertMakeFile("bar", 0644, "bar0");
+       assertMakeFile("foo", 0644, "foo0");
+       assertEqualInt(0,
+           systemf("%s -xf ../archive.tar -k >test.out 2>test.err", testprog));
+       assertFileContents("foo0", 4, "foo");
+       assertFileContents("bar0", 4, "bar");
+       assertEmptyFile("test.out");
+       assertEmptyFile("test.err");
+       assertChdir("..");
+}