Reduce the likelihood of false hardlinks by ignoring entries with

nlinks <= 1 when comparing dev/ino values.  This seems to address Issue 54.

SVN-Revision: 1718

diff --git a/Makefile.am b/Makefile.am
index 9ea8b64924fd8c07a1bdf6b9d275962381aa703e..b9b197874d733b96a0a45dc3507749ff1f9a5fcc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -227,6 +227,7 @@ libarchive_test_SOURCES=                                    \
        libarchive/test/test_archive_api_feature.c              \
        libarchive/test/test_bad_fd.c                           \
        libarchive/test/test_compat_bzip2.c                     \
+       libarchive/test/test_compat_cpio.c                      \
        libarchive/test/test_compat_gtar.c                      \
        libarchive/test/test_compat_gzip.c                      \
        libarchive/test/test_compat_lzma.c                      \
@@ -340,6 +341,7 @@ libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/
 libarchive_test_EXTRA_DIST=\
        libarchive/test/test_compat_bzip2_1.tbz.uu                      \
        libarchive/test/test_compat_bzip2_2.tbz.uu                      \
+       libarchive/test/test_compat_cpio_1.cpio.uu                      \
        libarchive/test/test_compat_gtar_1.tar.uu                       \
        libarchive/test/test_compat_gzip_1.tgz.uu                       \
        libarchive/test/test_compat_gzip_2.tgz.uu                       \

diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c
index 2cb719b3ec183d16623094d127cad54c751ecac1..3b1658124a23b1f18cddf5e355b353b157445414 100644 (file)
--- a/libarchive/archive_read_support_format_cpio.c
+++ b/libarchive/archive_read_support_format_cpio.c
@@ -731,6 +731,9 @@ record_hardlink(struct cpio *cpio, struct archive_entry *entry)
        dev_t dev;
        int64_t ino;
 
+       if (archive_entry_nlink(entry) <= 1)
+               return;
+
        dev = archive_entry_dev(entry);
        ino = archive_entry_ino64(entry);
 

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index cea9e7940292456504d58ef3b6502369738337d4..626340a4161f5bf08df5f9ed755de547b501a971 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -19,6 +19,7 @@ IF(ENABLE_TEST)
     test_archive_api_feature.c
     test_bad_fd.c
     test_compat_bzip2.c
+    test_compat_cpio.c
     test_compat_gtar.c
     test_compat_gzip.c
     test_compat_lzma.c

diff --git a/libarchive/test/test_compat_cpio.c b/libarchive/test/test_compat_cpio.c
new file mode 100644 (file)
index 0000000..b0ead39
--- /dev/null
+++ b/libarchive/test/test_compat_cpio.c
@@ -0,0 +1,106 @@
+/*-
+ * Copyright (c) 2003-2009 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$");
+
+/*
+ * Verify our ability to read various sample files.
+ * It should be easy to add any new sample files sent in by users
+ * to this collection of tests.
+ */
+
+/* Copy this function for each test file and adjust it accordingly. */
+
+/*
+ * test_compat_cpio_1.cpio checks heuristics for avoiding false
+ * hardlinks.  foo1 and foo2 are files that have nlinks=1 and so
+ * should not be marked as hardlinks even though they have identical
+ * ino values.  bar1 and bar2 have nlinks=2 so should be marked
+ * as hardlinks.
+ */
+static void
+test_compat_cpio_1(void)
+{
+       char name[] = "test_compat_cpio_1.cpio";
+       struct archive_entry *ae;
+       struct archive *a;
+
+       assert((a = archive_read_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+       extract_reference_file(name);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 17));
+
+       /* Read first entry. */
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualString("foo1", archive_entry_pathname(ae));
+       assertEqualString(NULL, archive_entry_hardlink(ae));
+       assertEqualInt(1260250228, archive_entry_mtime(ae));
+       assertEqualInt(1000, archive_entry_uid(ae));
+       assertEqualInt(1000, archive_entry_gid(ae));
+       assertEqualInt(0100644, archive_entry_mode(ae));
+
+       /* Read second entry. */
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualString("foo2", archive_entry_pathname(ae));
+       assertEqualString(NULL, archive_entry_hardlink(ae));
+       assertEqualInt(1260250228, archive_entry_mtime(ae));
+       assertEqualInt(1000, archive_entry_uid(ae));
+       assertEqualInt(1000, archive_entry_gid(ae));
+       assertEqualInt(0100644, archive_entry_mode(ae));
+
+       /* Read third entry. */
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualString("bar1", archive_entry_pathname(ae));
+       assertEqualString(NULL, archive_entry_hardlink(ae));
+       assertEqualInt(1260250228, archive_entry_mtime(ae));
+       assertEqualInt(1000, archive_entry_uid(ae));
+       assertEqualInt(1000, archive_entry_gid(ae));
+       assertEqualInt(0100644, archive_entry_mode(ae));
+
+       /* Read fourth entry. */
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualString("bar2", archive_entry_pathname(ae));
+       assertEqualString("bar1", archive_entry_hardlink(ae));
+       assertEqualInt(1260250228, archive_entry_mtime(ae));
+       assertEqualInt(1000, archive_entry_uid(ae));
+       assertEqualInt(1000, archive_entry_gid(ae));
+       assertEqualInt(0100644, archive_entry_mode(ae));
+
+       /* Verify that the format detection worked. */
+       assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
+
+       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+}
+
+
+DEFINE_TEST(test_compat_cpio)
+{
+       test_compat_cpio_1();
+}
+
+

diff --git a/libarchive/test/test_compat_cpio_1.cpio.uu b/libarchive/test/test_compat_cpio_1.cpio.uu
new file mode 100644 (file)
index 0000000..5cfc0d2
--- /dev/null
+++ b/libarchive/test/test_compat_cpio_1.cpio.uu
@@ -0,0 +1,17 @@
+begin 644 test_compat_cpio_1.cpio
+M,#<P-S`Q,#`U-CEE8F4P,#`P.#%A-#`P,#`P,V4X,#`P,#`S93@P,#`P,#`P
+M,31B,61E-#<T,#`P,#`P,#0P,#`P,#`P,#`P,#`P,#4T,#`P,#`P,#`P,#`P
+M,#`P,#`P,#`P,#`U,#`P,#`P,#!F;V\Q``!F;V\*,#<P-S`Q,#`U-CEE8F4P
+M,#`P.#%A-#`P,#`P,V4X,#`P,#`S93@P,#`P,#`P,31B,61E-#<T,#`P,#`P
+M,#0P,#`P,#`P,#`P,#`P,#4T,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`U,#`P
+M,#`P,#!F;V\R``!B87(*,#<P-S`Q,#`U-CEE8F4P,#`P.#%A-#`P,#`P,V4X
+M,#`P,#`S93@P,#`P,#`P,C1B,61E-#<T,#`P,#`P,#0P,#`P,#`P,#`P,#`P
+M,#4T,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`U,#`P,#`P,#!B87(Q``!B87H*
+M,#<P-S`Q,#`U-CEE8F4P,#`P.#%A-#`P,#`P,V4X,#`P,#`S93@P,#`P,#`P
+M,C1B,61E-#<T,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#4T,#`P,#`P,#`P,#`P
+M,#`P,#`P,#`P,#`U,#`P,#`P,#!B87(R```P-S`W,#$P,#`P,#`P,#`P,#`P
+M,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`Q,#`P,#`P,#`P,#`P,#`P,#`P
+M,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`P,&(P,#`P,#`P
+/,%1204E,15(A(2$`````
+`
+end