Simplify test case per PR comments

Signed-off-by: Paul Spangler <paul.spangler@ni.com>

diff --git a/libarchive/test/test_write_disk_perms.c b/libarchive/test/test_write_disk_perms.c
index 0872138c5300b914ba8cadafecc8b104a54ea470..8205d6abc59a36e3b7a10def7172be5ef1b24711 100644 (file)
--- a/libarchive/test/test_write_disk_perms.c
+++ b/libarchive/test/test_write_disk_perms.c
@@ -131,6 +131,8 @@ DEFINE_TEST(test_write_disk_perms)
        struct archive *a;
        struct archive_entry *ae;
        struct stat st;
+       uid_t original_uid;
+       uid_t try_to_change_uid;
 
        assertUmask(UMASK);
 
@@ -203,47 +205,35 @@ DEFINE_TEST(test_write_disk_perms)
 
        /* For dir, the owner should get left when not overwritting. */
        assertMakeDir("dir_owner", 0744);
+
        if (getuid() == 0) {
-               assertEqualInt(0, chown("dir_owner", getuid()+1, getgid()));
-               /* Check original owner. */
-               assertEqualInt(0, stat("dir_owner", &st));
-               failure("dir_owner: st.st_uid=%d", st.st_uid);
-               assertEqualInt(st.st_uid, getuid()+1);
-               /* Shouldn't edit the owner when no overwrite option is set. */
-               assert((ae = archive_entry_new()) != NULL);
-               archive_entry_copy_pathname(ae, "dir_owner");
-               archive_entry_set_mode(ae, S_IFDIR | 0744);
-               archive_entry_set_uid(ae, getuid());
-               archive_write_disk_set_options(a,
-                       ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_NO_OVERWRITE);
-               assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
-               archive_entry_free(ae);
-               assertEqualIntA(a, ARCHIVE_OK, archive_write_finish_entry(a));
-               /* Make sure they're unchanged. */
-               assertEqualInt(0, stat("dir_owner", &st));
-               failure("dir_owner: st.st_uid=%d", st.st_uid);
-               assertEqualInt(st.st_uid, getuid()+1);
+               original_uid = getuid() + 1;
+               try_to_change_uid = getuid();
+               assertEqualInt(0, chown("dir_owner", original_uid, getgid()));
        } else {
-               /* Check original owner. */
-               assertEqualInt(0, stat("dir_owner", &st));
-               failure("dir_owner: st.st_uid=%d", st.st_uid);
-               assertEqualInt(st.st_uid, getuid());
-               /* Shouldn't fail to set owner when no overwrite option is set. */
-               assert((ae = archive_entry_new()) != NULL);
-               archive_entry_copy_pathname(ae, "dir_owner");
-               archive_entry_set_mode(ae, S_IFDIR | 0744);
-               archive_entry_set_uid(ae, getuid()+1);
-               archive_write_disk_set_options(a,
-                       ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_NO_OVERWRITE);
-               assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
-               archive_entry_free(ae);
-               assertEqualIntA(a, ARCHIVE_OK, archive_write_finish_entry(a));
-               /* Make sure they're unchanged. */
-               assertEqualInt(0, stat("dir_owner", &st));
-               failure("dir_owner: st.st_uid=%d", st.st_uid);
-               assertEqualInt(st.st_uid, getuid());
+               original_uid = getuid();
+               try_to_change_uid = getuid() + 1;
        }
 
+       /* Check original owner. */
+       assertEqualInt(0, stat("dir_owner", &st));
+       failure("dir_owner: st.st_uid=%d", st.st_uid);
+       assertEqualInt(st.st_uid, original_uid);
+       /* Shouldn't try to edit the owner when no overwrite option is set. */
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_copy_pathname(ae, "dir_owner");
+       archive_entry_set_mode(ae, S_IFDIR | 0744);
+       archive_entry_set_uid(ae, try_to_change_uid);
+       archive_write_disk_set_options(a,
+           ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_NO_OVERWRITE);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_finish_entry(a));
+       /* Make sure they're unchanged. */
+       assertEqualInt(0, stat("dir_owner", &st));
+       failure("dir_owner: st.st_uid=%d", st.st_uid);
+       assertEqualInt(st.st_uid, original_uid);
+
        /* Write a regular file with SUID bit, but don't use _EXTRACT_PERM. */
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_copy_pathname(ae, "file_no_suid");