Properly guard calls to lstat

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 8de796fb830646aacf89f46be33101e75469d814..e9657f6a72e8f83400ae1529a7bd6dce02425eef 100644 (file)
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -2567,7 +2567,11 @@ tree_current_lstat(struct tree *t)
 #else
                if (tree_enter_working_dir(t) != 0)
                        return NULL;
+#ifdef HAVE_LSTAT
                if (lstat(tree_current_access_path(t), &t->lst) != 0)
+#else
+               if (la_stat(tree_current_access_path(t), &t->lst) != 0)
+#endif
 #endif
                        return NULL;
                t->flags |= hasLstat;

diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
index 2bc3ba066c3baef4692998e5d6f019a280640c3e..a5fa30e3c2b6006c2a90a534dce899acf39e5f2d 100644 (file)
--- a/libarchive/archive_read_support_format_mtree.c
+++ b/libarchive/archive_read_support_format_mtree.c
@@ -1280,7 +1280,13 @@ parse_file(struct archive_read *a, struct archive_entry *entry,
                                mtree->fd = -1;
                                st = NULL;
                        }
-               } else if (lstat(path, st) == -1) {
+               }
+#ifdef HAVE_LSTAT
+               else if (lstat(path, st) == -1)
+#else
+               else if (la_stat(path, st) == -1)
+#endif
+               {
                        st = NULL;
                }
 

diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index 09a5eef03dab0e1d28391156fbc9acbec8f92cf0..a9c4530933a6f81d8cf9adc0c01d1b1127885613 100644 (file)
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -514,7 +514,12 @@ lazy_stat(struct archive_write_disk *a)
         * XXX At this point, symlinks should not be hit, otherwise
         * XXX a race occurred.  Do we want to check explicitly for that?
         */
-       if (lstat(a->name, &a->st) == 0) {
+#ifdef HAVE_LSTAT
+       if (lstat(a->name, &a->st) == 0)
+#else
+       if (la_stat(a->name, &a->st) == 0)
+#endif
+       {
                a->pst = &a->st;
                return (ARCHIVE_OK);
        }
@@ -2154,7 +2159,11 @@ restore_entry(struct archive_write_disk *a)
                 * then don't follow it.
                 */
                if (r != 0 || !S_ISDIR(a->mode))
+#ifdef HAVE_LSTAT
                        r = lstat(a->name, &a->st);
+#else
+                       r = la_stat(a->name, &a->st);
+#endif
                if (r != 0) {
                        archive_set_error(&a->archive, errno,
                            "Can't stat existing object");
@@ -2550,7 +2559,12 @@ _archive_write_disk_close(struct archive *_a)
                                        goto skip_fixup_entry;
                                } else
 #endif
-                               if (lstat(p->name, &st) != 0 ||
+                               if (
+#ifdef HAVE_LSTAT
+                                       lstat(p->name, &st) != 0 ||
+#else
+                                       la_stat(p->name, &st) != 0 ||
+#endif
                                    la_verify_filetype(st.st_mode,
                                    p->filetype) == 0) {
                                        goto skip_fixup_entry;
@@ -2565,7 +2579,12 @@ _archive_write_disk_close(struct archive *_a)
                                goto skip_fixup_entry;
                        } else
 #endif
-                       if (lstat(p->name, &st) != 0 ||
+                       if (
+#ifdef HAVE_LSTAT
+                               lstat(p->name, &st) != 0 ||
+#else
+                               la_stat(p->name, &st) != 0 ||
+#endif
                            la_verify_filetype(st.st_mode,
                            p->filetype) == 0) {
                                goto skip_fixup_entry;
@@ -2859,8 +2878,10 @@ check_symlinks_fsobj(char *path, int *a_eno, struct archive_string *a_estr,
                /* Check that we haven't hit a symlink. */
 #if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT)
                r = fstatat(chdir_fd, head, &st, AT_SYMLINK_NOFOLLOW);
-#else
+#elif defined(HAVE_LSTAT)
                r = lstat(head, &st);
+#else
+               r = la_stat(head, &st);
 #endif
                if (r != 0) {
                        tail[0] = c;
@@ -4391,7 +4412,12 @@ fixup_appledouble(struct archive_write_disk *a, const char *pathname)
         */
        archive_strncpy(&datafork, pathname, p - pathname);
        archive_strcat(&datafork, p + 2);
-       if (lstat(datafork.s, &st) == -1 ||
+       if (
+#ifdef HAVE_LSTAT
+               lstat(datafork.s, &st) == -1 ||
+#else
+               la_stat(datafork.s, &st) == -1 ||
+#endif
            (st.st_mode & AE_IFMT) != AE_IFREG)
                goto skip_appledouble;