From 5c6d3586d21f4d4193d57a89540051e54d4cc27e Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Mon, 10 Nov 2008 13:55:20 -0500 Subject: [PATCH] Cleanup on platforms that lack utimes() or stat.st_blksize Submitted by: Ivailo Petrov SVN-Revision: 249 --- libarchive/archive_write_disk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c index 4d7691ed0..a1d820b20 100644 --- a/libarchive/archive_write_disk.c +++ b/libarchive/archive_write_disk.c @@ -518,7 +518,6 @@ write_data_block(struct archive_write_disk *a, { ssize_t bytes_written = 0; ssize_t block_size = 0, bytes_to_write; - int r; if (a->filesize == 0 || a->fd < 0) { archive_set_error(&a->archive, 0, @@ -528,6 +527,7 @@ write_data_block(struct archive_write_disk *a, if (a->flags & ARCHIVE_EXTRACT_SPARSE) { #if HAVE_STRUCT_STAT_ST_BLKSIZE + int r; if ((r = _archive_write_disk_lazy_stat(a)) != ARCHIVE_OK) return (r); block_size = a->pst->st_blksize; @@ -1752,7 +1752,7 @@ set_time(int fd, int mode, const char *name, (void)mtime_nsec; /* UNUSED */ times.actime = atime; times.modtime = mtime; - if (S_ISLINK(mode)) + if (S_ISLNK(mode)) return (ARCHIVE_OK); return (utime(name, ×)); } -- 2.47.3