Prefer AE_* defines for portability.

SVN-Revision: 1287

diff --git a/libarchive/test/test_read_extract.c b/libarchive/test/test_read_extract.c
index 152f07744cc9cf5191b274d9fd4d388b1fca1499..7d64c414d4af50d5b8f6e08380609f14995bff69 100644 (file)
--- a/libarchive/test/test_read_extract.c
+++ b/libarchive/test/test_read_extract.c
@@ -96,7 +96,7 @@ DEFINE_TEST(test_read_extract)
        /* A symlink. */
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_copy_pathname(ae, "symlink");
-       archive_entry_set_mode(ae, S_IFLNK | 0755);
+       archive_entry_set_mode(ae, AE_IFLNK | 0755);
        archive_entry_set_symlink(ae, "file");
        assertA(0 == archive_write_header(a, ae));
        archive_entry_free(ae);

diff --git a/libarchive/test/test_write_format_cpio_newc.c b/libarchive/test/test_write_format_cpio_newc.c
index f4dd4dde60222a18e9e0df80f6cc3122b62de733..0843ee6cff19069eafd37f35cfc2d3421a0a2886 100644 (file)
--- a/libarchive/test/test_write_format_cpio_newc.c
+++ b/libarchive/test/test_write_format_cpio_newc.c
@@ -99,7 +99,8 @@ DEFINE_TEST(test_write_format_cpio_newc)
        assert((entry = archive_entry_new()) != NULL);
        archive_entry_set_mtime(entry, 3, 30);
        archive_entry_set_pathname(entry, "lnk");
-       archive_entry_set_mode(entry, S_IFLNK | 0664);
+       archive_entry_set_mode(entry, 0664);
+       archive_entry_set_filetype(entry, AE_IFLNK);
        archive_entry_set_size(entry, 0);
        archive_entry_set_uid(entry, 83);
        archive_entry_set_gid(entry, 93);

diff --git a/libarchive/test/test_write_format_cpio_odc.c b/libarchive/test/test_write_format_cpio_odc.c
index 504045d8529126ad526f946d6dcaad4a94f2175f..7bc3c9927c6de7693e35a71c51b06d605009dac2 100644 (file)
--- a/libarchive/test/test_write_format_cpio_odc.c
+++ b/libarchive/test/test_write_format_cpio_odc.c
@@ -109,7 +109,8 @@ DEFINE_TEST(test_write_format_cpio_odc)
        assert((entry = archive_entry_new()) != NULL);
        archive_entry_set_mtime(entry, 3, 30);
        archive_entry_set_pathname(entry, "symlink");
-       archive_entry_set_mode(entry, S_IFLNK | 0664);
+       archive_entry_set_mode(entry, 0664);
+       archive_entry_set_filetype(entry, AE_IFLNK);
        archive_entry_set_symlink(entry,"file");
        archive_entry_set_size(entry, 0);
        archive_entry_set_uid(entry, 88);

diff --git a/libarchive/test/test_write_format_tar_ustar.c b/libarchive/test/test_write_format_tar_ustar.c
index 637d276063943dccfd81cb95af5918eae5ff4f02..0105ad8ca62783ab3646deb542c9eb854c8e7f10 100644 (file)
--- a/libarchive/test/test_write_format_tar_ustar.c
+++ b/libarchive/test/test_write_format_tar_ustar.c
@@ -133,7 +133,8 @@ DEFINE_TEST(test_write_format_tar_ustar)
        assert((entry = archive_entry_new()) != NULL);
        archive_entry_set_mtime(entry, 3, 30);
        archive_entry_set_pathname(entry, "symlink");
-       archive_entry_set_mode(entry, S_IFLNK | 0664);
+       archive_entry_set_mode(entry, 0664);
+       archive_entry_set_filetype(entry, AE_IFLNK);
        archive_entry_set_symlink(entry,"file");
        archive_entry_set_size(entry, 0);
        archive_entry_set_uid(entry, 88);