From: Ron Yorston <rmy@pobox.com>
Date: Tue, 22 Aug 2017 10:34:03 +0000 (+0100)
Subject: libarchive: fix build failure on NOMMU systems
X-Git-Tag: 1_28_0~102
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e837a0dbbebf4229306df98fe9ee3b9bb30630c4;p=oweals%2Fbusybox.git

libarchive: fix build failure on NOMMU systems

In the old code fd was an argument, now we need to get the file descriptor
from the xstate structure.

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 290dd130f..e81a81072 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -234,7 +234,7 @@ static void fork_transformer_and_free(transformer_state_t *xstate)
 	 * an external unzipper that wants
 	 * file position at the start of the file.
 	 */
-	xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+	xlseek(xstate->src_fd, - xstate->signature_skipped, SEEK_CUR);
 	xstate->signature_skipped = 0;
 	fork_transformer_with_sig(xstate->src_fd, xstate->xformer, xstate->xformer_prog);
 # endif