More portability improvements.

SVN-Revision: 1286

diff --git a/libarchive/test/test_acl_pax.c b/libarchive/test/test_acl_pax.c
index 1d616a8159a1665661a51f9ba758244e9ce9e5a8..d4fb0aa9ea583cd69d455e1854676aca2f32746c 100644 (file)
--- a/libarchive/test/test_acl_pax.c
+++ b/libarchive/test/test_acl_pax.c
@@ -406,7 +406,7 @@ DEFINE_TEST(test_acl_pax)
        struct archive *a;
        struct archive_entry *ae;
        size_t used;
-       int fd;
+       FILE *f;
 
        /* Write an archive to memory. */
        assert(NULL != (a = archive_write_new()));
@@ -453,16 +453,14 @@ DEFINE_TEST(test_acl_pax)
 #endif
 
        /* Write out the data we generated to a file for manual inspection. */
-       assert(-1 < (fd = open("testout",
-                   O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0775)));
-       assert(used == (size_t)write(fd, buff, (unsigned int)used));
-       close(fd);
+       assert(NULL != (f = fopen("testout", "wb")));
+       assertEqualInt(used, (size_t)fwrite(buff, 1, (unsigned int)used, f));
+       fclose(f);
 
        /* Write out the reference data to a file for manual inspection. */
-       assert(-1 < (fd = open("reference",
-                   O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0775)));
-       assert(sizeof(reference) == write(fd, reference, sizeof(reference)));
-       close(fd);
+       assert(NULL != (f = fopen("reference", "wb")));
+       assert(sizeof(reference) == fwrite(reference, 1, sizeof(reference), f));
+       fclose(f);
 
        /* Assert that the generated data matches the built-in reference data.*/
        failure("Generated pax archive does not match reference; check 'testout' and 'reference' files.");

diff --git a/libarchive/test/test_read_extract.c b/libarchive/test/test_read_extract.c
index c402d5246b51c5309fc6b4f15735f418ea7c0aa9..152f07744cc9cf5191b274d9fd4d388b1fca1499 100644 (file)
--- a/libarchive/test/test_read_extract.c
+++ b/libarchive/test/test_read_extract.c
@@ -40,7 +40,7 @@ DEFINE_TEST(test_read_extract)
        file_buff = malloc(FILE_BUFF_SIZE);
 
        /* Force the umask to something predictable. */
-       umask(022);
+       assertUmask(022);
 
        /* Create a new archive in memory containing various types of entries. */
        assert((a = archive_write_new()) != NULL);

diff --git a/libarchive/test/test_tar_large.c b/libarchive/test/test_tar_large.c
index a99ed33bed2b14eb14f5de73c431ec155d516504..288dd6f3d8f37e9986163e42f7cd18d06950e6ab 100644 (file)
--- a/libarchive/test/test_tar_large.c
+++ b/libarchive/test/test_tar_large.c
@@ -190,7 +190,7 @@ memory_read_skip(struct archive *a, void *_private, off_t skip)
        }
        if (private->filebytes > 0) {
                if (private->filebytes < skip)
-                       skip = private->filebytes;
+                       skip = (off_t)private->filebytes;
                private->filebytes -= skip;
        } else {
                skip = 0;

diff --git a/libarchive/test/test_write_disk.c b/libarchive/test/test_write_disk.c
index cead3f7a2fee87921034d23a926f478b5f680efd..07fece8694457ab3493fe44c82a3ea6305842ca3 100644 (file)
--- a/libarchive/test/test_write_disk.c
+++ b/libarchive/test/test_write_disk.c
@@ -248,7 +248,7 @@ DEFINE_TEST(test_write_disk)
        struct archive_entry *ae;
 
        /* Force the umask to something predictable. */
-       umask(UMASK);
+       assertUmask(UMASK);
 
        /* A regular file. */
        assert((ae = archive_entry_new()) != NULL);

diff --git a/libarchive/test/test_write_disk_hardlink.c b/libarchive/test/test_write_disk_hardlink.c
index 90da147b886281bffc60297fcb51a38a511937fa..a206099fa9911e1cbc29e8e1fa76f1ca5edf9607 100644 (file)
--- a/libarchive/test/test_write_disk_hardlink.c
+++ b/libarchive/test/test_write_disk_hardlink.c
@@ -52,7 +52,7 @@ DEFINE_TEST(test_write_disk_hardlink)
        struct stat st, st2;
 
        /* Force the umask to something predictable. */
-       umask(UMASK);
+       assertUmask(UMASK);
 
        /* Write entries to disk. */
        assert((ad = archive_write_disk_new()) != NULL);

diff --git a/libarchive/test/test_write_disk_secure.c b/libarchive/test/test_write_disk_secure.c
index ffb828f4b501c7fa4471cb33e94b0f578c3c5ec5..4709f9019637371f702463c313707590f51f5c99 100644 (file)
--- a/libarchive/test/test_write_disk_secure.c
+++ b/libarchive/test/test_write_disk_secure.c
@@ -42,7 +42,7 @@ DEFINE_TEST(test_write_disk_secure)
        struct stat st;
 
        /* Start with a known umask. */
-       umask(UMASK);
+       assertUmask(UMASK);
 
        /* Create an archive_write_disk object. */
        assert((a = archive_write_disk_new()) != NULL);