[git commit] libarchive: fix build failure on NOMMU systems

Denys Vlasenko vda.linux at googlemail.com
Tue Aug 22 13:41:33 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=e837a0dbbebf4229306df98fe9ee3b9bb30630c4
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

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 at pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 archival/libarchive/open_transformer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 290dd13..e81a810 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


More information about the busybox-cvs mailing list