Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/libarchive/dist/libarchive/test pull fix from h...



details:   https://anonhg.NetBSD.org/src/rev/8ba26d483308
branches:  trunk
changeset: 1006467:8ba26d483308
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 17 00:36:20 2020 +0000

description:
pull fix from head (O_EXEC means O_SEARCH only on FreeBSD)

diffstat:

 external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r b190ecb6a0cc -r 8ba26d483308 external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c
--- a/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c        Thu Jan 16 16:47:19 2020 +0000
+++ b/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c        Fri Jan 17 00:36:20 2020 +0000
@@ -1775,7 +1775,8 @@
        archive_entry_clear(ae);
        r = archive_read_next_header2(a, ae);
        if (r == ARCHIVE_FAILED) {
-#if defined(O_PATH) || defined(O_SEARCH) || defined(O_EXEC)
+#if defined(O_PATH) || defined(O_SEARCH) || \
+ (defined(__FreeBSD__) && defined(O_EXEC))
                assertEqualIntA(a, ARCHIVE_OK, r);
 #endif
                /* Close the disk object. */



Home | Main Index | Thread Index | Old Index