From 53c3b087b078e040705a68d085644b7ca060962a Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Tue, 24 May 2016 11:05:53 +0100 Subject: archival: remove WIN32-specific code now lseek fails on pipes --- archival/cpio.c | 4 ---- archival/libarchive/init_handle.c | 5 ----- 2 files changed, 9 deletions(-) diff --git a/archival/cpio.c b/archival/cpio.c index d0cedd35c..3b1550720 100644 --- a/archival/cpio.c +++ b/archival/cpio.c @@ -403,10 +403,6 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) #if !ENABLE_FEATURE_CPIO_O if (opt & OPT_FILE) { /* -F */ xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO); -#if ENABLE_PLATFORM_MINGW32 - /* default is seek_by_read but seek_by_jump is OK for file */ - archive_handle->seek = seek_by_jump; -#endif } #else if ((opt & (OPT_FILE|OPT_CREATE)) == OPT_FILE) { /* -F without -o */ diff --git a/archival/libarchive/init_handle.c b/archival/libarchive/init_handle.c index b1166d577..cbae06ac3 100644 --- a/archival/libarchive/init_handle.c +++ b/archival/libarchive/init_handle.c @@ -16,12 +16,7 @@ archive_handle_t* FAST_FUNC init_handle(void) archive_handle->action_header = header_skip; archive_handle->action_data = data_skip; archive_handle->filter = filter_accept_all; -#if !ENABLE_PLATFORM_MINGW32 archive_handle->seek = seek_by_jump; -#else - /* can't reliably detect pipes on WIN32: default to seek_by_read */ - archive_handle->seek = seek_by_read; -#endif return archive_handle; } -- cgit v1.2.3-55-g6feb