Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

libarchive: fix open_zipped()

Browse Source 
Last commit broke it (on both MMU and NOMMU)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-06-20 11:42:00 +02:00
parent 984b0a613a
commit df3ec0e2f7
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
archival/libarchive/open_transformer.c
View File

@ -220,7 +220,6 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
*/ */
// USE_FOR_MMU(xstate->xformer = copy_stream;) // USE_FOR_MMU(xstate->xformer = copy_stream;)
// USE_FOR_NOMMU(xstate->xformer_prog = "cat";) // USE_FOR_NOMMU(xstate->xformer_prog = "cat";)
/* fall through to seeking bck over bytes we read earlier */
found_magic: found_magic:
return xstate; return xstate;
@ -289,16 +288,22 @@ int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed)
return -1; return -1;
fd = xstate->src_fd; fd = xstate->src_fd;
if (xstate->xformer) {
# if BB_MMU # if BB_MMU
fork_transformer_with_no_sig(xstate->src_fd, xstate->xformer); if (xstate->xformer) {
# else fork_transformer_with_no_sig(fd, xstate->xformer);
} else {
/* the file is not compressed */
xlseek(fd, - xstate->signature_skipped, SEEK_CUR); xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
xstate->signature_skipped = 0; xstate->signature_skipped = 0;
fork_transformer_with_sig(xstate->src_fd, xstate->xformer, xstate->xformer_prog);
# endif
} }
/* else: the file is not compressed */ # else
/* NOMMU can't avoid the seek :( */
xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
xstate->signature_skipped = 0;
if (xstate->xformer) {
fork_transformer_with_sig(fd, xstate->xformer, xstate->xformer_prog);
} /* esle: the file is not compressed */
# endif
free(xstate); free(xstate);
return fd; return fd;