Do not add "./" prefix to the current directory name ".", it is not necessary.

Add test for appending "./" prefix.

diff --git a/Makefile.am b/Makefile.am
index ba47afc607f9b4e043da2bdbb7133682696c0006..ca932b6e432037967415979e1ab8358678ffa282 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -426,6 +426,7 @@ libarchive_test_SOURCES=                                    \
        libarchive/test/test_write_format_iso9660_zisofs.c      \
        libarchive/test/test_write_format_mtree.c               \
        libarchive/test/test_write_format_mtree_fflags.c        \
+       libarchive/test/test_write_format_mtree_no_separator.c  \
        libarchive/test/test_write_format_pax.c                 \
        libarchive/test/test_write_format_shar_empty.c          \
        libarchive/test/test_write_format_tar.c                 \

diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 6d558a0383b318b165cbd99ba6d7ece6aa0c19c5..4d13c72c658d7e309d8975e266080cb895833fb5 100644 (file)
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -887,7 +887,14 @@ write_entry(struct archive_write *a, struct mtree_entry *me)
 
        archive_string_empty(&mtree->ebuf);
        str = (mtree->indent)? &mtree->ebuf : &mtree->buf;
-       if (strchr(me->pathname, '/') == NULL ) {
+
+       /* If the pathname does not have a path separator, we have to
+        * add "./" to the head of the pathename because mtree reader
+        * will suppose that it is v1(a.k.a classic) mtree format and
+        * change the directory unexpectedly and so it will make a wrong
+        * path. */
+       if (strchr(me->pathname, '/') == NULL &&
+           strcmp(me->pathname, ".") != 0) {
                archive_strcat(str, "./");
        }
        mtree_quote(str, me->pathname);

diff --git a/libarchive/test/test_write_format_mtree_no_separator.c b/libarchive/test/test_write_format_mtree_no_separator.c
new file mode 100644 (file)
index 0000000..faf42dd
--- /dev/null
+++ b/libarchive/test/test_write_format_mtree_no_separator.c
@@ -0,0 +1,103 @@
+/*-
+ * Copyright (c) 2012 Michihiro NAKAJIMA
+ * 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
+ *    in this position and unchanged.
+ * 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$");
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+static char buff[4096];
+
+DEFINE_TEST(test_write_format_mtree_no_separator)
+{
+       struct archive_entry *ae;
+       struct archive* a;
+       size_t used;
+
+       /* Create a mtree format archive. */
+       assert((a = archive_write_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_mtree(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_write_open_memory(a, buff, sizeof(buff)-1, &used));
+
+       /* Write "." file.  */
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_copy_pathname(ae, ".");
+       archive_entry_set_mode(ae, AE_IFDIR | 0755);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       /* Write "noseparator" file.  */
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_copy_pathname(ae, "noseparator");
+       archive_entry_set_size(ae, 0);
+       archive_entry_set_mode(ae, AE_IFREG | 0644);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       /* Write "./withseparator" file.  */
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_copy_pathname(ae, "./withseparator");
+       archive_entry_set_size(ae, 0);
+       archive_entry_set_mode(ae, AE_IFREG | 0644);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
+        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+
+       /*
+        * Read the data and check it.
+        */
+       assert((a = archive_read_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used));
+
+       /* Read "." file. */
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       failure("The path should be just \".\"");
+       assertEqualString(archive_entry_pathname(ae), ".");
+       assertEqualInt(archive_entry_mode(ae), AE_IFDIR | 0755);
+
+       /* Read "./noseparator" file. */
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       failure("The path should have \"./\" prefix");
+       assertEqualString(archive_entry_pathname(ae), "./noseparator");
+       assertEqualInt(archive_entry_size(ae), 0);
+       assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0644);
+
+       /* Read "./withseparator" file. */
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualString(archive_entry_pathname(ae), "./withseparator");
+       assertEqualInt(archive_entry_size(ae), 0);
+       assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0644);
+
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+