Merge r294:337,r348:350 from libarchive.googlecode.com: A lot

of work to make libarchive work on Windows.

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/libarchive/test/test_write_disk_secure.c b/lib/libarchive/test/test_write_disk_secure.c
index b898c97119e4..4c014b164057 100644
--- a/lib/libarchive/test/test_write_disk_secure.c
+++ b/lib/libarchive/test/test_write_disk_secure.c
@@ -55,6 +55,7 @@ DEFINE_TEST(test_write_disk_secure)
 	archive_entry_free(ae);
 	assert(0 == archive_write_finish_entry(a));
 
+#ifndef _WIN32
 	/* Write a symlink to the dir above. */
 	assert((ae = archive_entry_new()) != NULL);
 	archive_entry_copy_pathname(ae, "link_to_dir");
@@ -149,6 +150,7 @@ DEFINE_TEST(test_write_disk_secure)
 	assertEqualInt(0, lstat("link_to_dir4", &st));
 	assert(S_ISDIR(st.st_mode));
 	archive_entry_free(ae);
+#endif
 
 	/*
 	 * As above, but a link to a non-dir, so the link should get replaced.
@@ -185,6 +187,7 @@ DEFINE_TEST(test_write_disk_secure)
 	assert(0 == archive_write_finish(a));
 #endif
 
+#ifndef _WIN32
 	/* Test the entries on disk. */
 	assert(0 == lstat("dir", &st));
 	failure("dir: st.st_mode=%o", st.st_mode);
@@ -217,4 +220,5 @@ DEFINE_TEST(test_write_disk_secure)
 	failure("link_to_dir2/filec: st.st_mode=%o", st.st_mode);
 	assert((st.st_mode & 07777) == 0755);
 #endif
+#endif
 }