diff -d -urpN busybox.0/archival/libarchive/decompress_bunzip2.c busybox.1/archival/libarchive/decompress_bunzip2.c --- busybox.0/archival/libarchive/decompress_bunzip2.c 2014-11-27 23:31:08.000000000 +0100 +++ busybox.1/archival/libarchive/decompress_bunzip2.c 2014-12-05 17:53:19.923428716 +0100 @@ -756,8 +756,7 @@ unpack_bz2_stream(transformer_aux_data_t i = IOBUF_SIZE - i; /* number of bytes produced */ if (i == 0) /* EOF? */ break; - if (i != full_write(dst_fd, outbuf, i)) { - bb_error_msg("short write"); + if (i != transformer_write(aux, dst_fd, outbuf, i)) { i = RETVAL_SHORT_WRITE; goto release_mem; } diff -d -urpN busybox.0/archival/libarchive/decompress_gunzip.c busybox.1/archival/libarchive/decompress_gunzip.c --- busybox.0/archival/libarchive/decompress_gunzip.c 2014-11-27 23:31:08.000000000 +0100 +++ busybox.1/archival/libarchive/decompress_gunzip.c 2014-12-05 18:01:16.614873989 +0100 @@ -971,7 +971,7 @@ static int inflate_get_next_window(STATE /* Called from unpack_gz_stream() and inflate_unzip() */ static IF_DESKTOP(long long) int -inflate_unzip_internal(STATE_PARAM int in, int out) +inflate_unzip_internal(STATE_PARAM transformer_aux_data_t *aux, int in, int out) { IF_DESKTOP(long long) int n = 0; ssize_t nwrote; @@ -1002,9 +1002,8 @@ inflate_unzip_internal(STATE_PARAM int i while (1) { int r = inflate_get_next_window(PASS_STATE_ONLY); - nwrote = full_write(out, gunzip_window, gunzip_outbuf_count); - if (nwrote != (ssize_t)gunzip_outbuf_count) { - bb_perror_msg("write"); + nwrote = transformer_write(aux, out, gunzip_window, gunzip_outbuf_count); + if (nwrote == (ssize_t)-1) { n = -1; goto ret; } @@ -1045,7 +1044,7 @@ inflate_unzip(transformer_aux_data_t *au // bytebuffer_max = 0x8000; bytebuffer_offset = 4; bytebuffer = xmalloc(bytebuffer_max); - n = inflate_unzip_internal(PASS_STATE in, out); + n = inflate_unzip_internal(PASS_STATE aux, in, out); free(bytebuffer); aux->crc32 = gunzip_crc; @@ -1224,7 +1223,7 @@ unpack_gz_stream(transformer_aux_data_t goto ret; } - n = inflate_unzip_internal(PASS_STATE src_fd, dst_fd); + n = inflate_unzip_internal(PASS_STATE aux, src_fd, dst_fd); if (n < 0) { total = -1; goto ret; diff -d -urpN busybox.0/archival/libarchive/decompress_uncompress.c busybox.1/archival/libarchive/decompress_uncompress.c --- busybox.0/archival/libarchive/decompress_uncompress.c 2014-11-27 23:31:08.000000000 +0100 +++ busybox.1/archival/libarchive/decompress_uncompress.c 2014-12-05 17:53:51.517149682 +0100 @@ -274,7 +274,7 @@ unpack_Z_stream(transformer_aux_data_t * } if (outpos >= OBUFSIZ) { - xwrite(dst_fd, outbuf, outpos); + xtransformer_write(aux, dst_fd, outbuf, outpos); IF_DESKTOP(total_written += outpos;) outpos = 0; } @@ -301,7 +301,7 @@ unpack_Z_stream(transformer_aux_data_t * } while (rsize > 0); if (outpos > 0) { - xwrite(dst_fd, outbuf, outpos); + xtransformer_write(aux, dst_fd, outbuf, outpos); IF_DESKTOP(total_written += outpos;) } diff -d -urpN busybox.0/archival/libarchive/decompress_unlzma.c busybox.1/archival/libarchive/decompress_unlzma.c --- busybox.0/archival/libarchive/decompress_unlzma.c 2014-11-27 23:31:08.000000000 +0100 +++ busybox.1/archival/libarchive/decompress_unlzma.c 2014-12-06 17:06:44.604076537 +0100 @@ -306,7 +306,7 @@ unpack_lzma_stream(transformer_aux_data_ if (buffer_pos == header.dict_size) { buffer_pos = 0; global_pos += header.dict_size; - if (full_write(dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size) + if (transformer_write(aux, dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size) goto bad; IF_DESKTOP(total_written += header.dict_size;) } @@ -440,7 +440,7 @@ unpack_lzma_stream(transformer_aux_data_ if (buffer_pos == header.dict_size) { buffer_pos = 0; global_pos += header.dict_size; - if (full_write(dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size) + if (transformer_write(aux, dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size) goto bad; IF_DESKTOP(total_written += header.dict_size;) } @@ -455,7 +455,7 @@ unpack_lzma_stream(transformer_aux_data_ { IF_NOT_DESKTOP(int total_written = 0; /* success */) IF_DESKTOP(total_written += buffer_pos;) - if (full_write(dst_fd, buffer, buffer_pos) != (ssize_t)buffer_pos) { + if (transformer_write(aux, dst_fd, buffer, buffer_pos) != (ssize_t)buffer_pos) { bad: total_written = -1; /* failure */ } diff -d -urpN busybox.0/archival/libarchive/decompress_unxz.c busybox.1/archival/libarchive/decompress_unxz.c --- busybox.0/archival/libarchive/decompress_unxz.c 2014-11-27 23:31:08.000000000 +0100 +++ busybox.1/archival/libarchive/decompress_unxz.c 2014-12-05 17:52:48.767148496 +0100 @@ -104,7 +104,7 @@ unpack_xz_stream(transformer_aux_data_t // bb_error_msg("mem_output_size_max != 0) { + size_t pos = aux->mem_output_size; + size_t size; + + size = (aux->mem_output_size += bufsize); + if (size > aux->mem_output_size_max) { + free(aux->mem_output_buf); + aux->mem_output_buf = NULL; + bb_perror_msg("buffer %u too small", (unsigned)aux->mem_output_size_max); + nwrote = -1; + goto ret; + } + aux->mem_output_buf = xrealloc(aux->mem_output_buf, size); + memcpy(aux->mem_output_buf + pos, buf, bufsize); + nwrote = bufsize; + } else { + nwrote = full_write(out_fd, buf, bufsize); + if (nwrote != (ssize_t)bufsize) { + bb_perror_msg("write"); + nwrote = -1; + goto ret; + } + } + ret: + return nwrote; +} + +ssize_t FAST_FUNC xtransformer_write(transformer_aux_data_t *aux, int out_fd, const void *buf, size_t bufsize) +{ + ssize_t nwrote = transformer_write(aux, out_fd, buf, bufsize); + if (nwrote != (ssize_t)bufsize) { + xfunc_die(); + } + return nwrote; +} + void check_errors_in_children(int signo) { int status; @@ -118,16 +158,19 @@ void FAST_FUNC open_transformer(int fd, /* Used by e.g. rpm which gives us a fd without filename, * thus we can't guess the format from filename's extension. */ -int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed) +static transformer_aux_data_t *setup_transformer_on_fd(int fd, int fail_if_not_compressed) { union { uint8_t b[4]; uint16_t b16[2]; uint32_t b32[1]; } magic; - int offset = -2; - USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd);) - USE_FOR_NOMMU(const char *xformer_prog;) + int offset; + transformer_aux_data_t *aux; + + offset = -2; + aux = xzalloc(sizeof(*aux)); + aux->src_fd = fd; /* .gz and .bz2 both have 2-byte signature, and their * unpack_XXX_stream wants this header skipped. */ @@ -135,15 +178,15 @@ int FAST_FUNC setup_unzip_on_fd(int fd, if (ENABLE_FEATURE_SEAMLESS_GZ && magic.b16[0] == GZIP_MAGIC ) { - USE_FOR_MMU(xformer = unpack_gz_stream;) - USE_FOR_NOMMU(xformer_prog = "gunzip";) + aux->xformer = unpack_gz_stream; + USE_FOR_NOMMU(aux->xformer_prog = "gunzip";) goto found_magic; } if (ENABLE_FEATURE_SEAMLESS_BZ2 && magic.b16[0] == BZIP2_MAGIC ) { - USE_FOR_MMU(xformer = unpack_bz2_stream;) - USE_FOR_NOMMU(xformer_prog = "bunzip2";) + aux->xformer = unpack_bz2_stream; + USE_FOR_NOMMU(aux->xformer_prog = "bunzip2";) goto found_magic; } if (ENABLE_FEATURE_SEAMLESS_XZ @@ -152,8 +195,8 @@ int FAST_FUNC setup_unzip_on_fd(int fd, offset = -6; xread(fd, magic.b32, sizeof(magic.b32[0])); if (magic.b32[0] == XZ_MAGIC2) { - USE_FOR_MMU(xformer = unpack_xz_stream;) - USE_FOR_NOMMU(xformer_prog = "unxz";) + aux->xformer = unpack_xz_stream; + USE_FOR_NOMMU(aux->xformer_prog = "unxz";) goto found_magic; } } @@ -164,52 +207,129 @@ int FAST_FUNC setup_unzip_on_fd(int fd, IF_FEATURE_SEAMLESS_BZ2("/bzip2") IF_FEATURE_SEAMLESS_XZ("/xz") " magic"); - xlseek(fd, offset, SEEK_CUR); - return 1; + + /* Some callers expect this function to "consume" fd + * even if data is not compressed. In this case, + * we return a state with trivial transformer. + */ +// USE_FOR_MMU(aux->xformer = copy_stream;) +// USE_FOR_NOMMU(aux->xformer_prog = "cat";) found_magic: -# if BB_MMU - open_transformer_with_no_sig(fd, xformer); -# else +# if !BB_MMU /* NOMMU version of open_transformer execs * an external unzipper that wants - * file position at the start of the file */ + * file position at the start of the file + */ xlseek(fd, offset, SEEK_CUR); - open_transformer_with_sig(fd, xformer, xformer_prog); # endif + return aux; +} + +/* Used by e.g. rpm which gives us a fd without filename, + * thus we can't guess the format from filename's extension. + */ +int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed) +{ + transformer_aux_data_t *aux = setup_transformer_on_fd(fd, fail_if_not_compressed); + + if (!aux || !aux->xformer) { + free(aux); + return 1; + } + +# if BB_MMU + open_transformer_with_no_sig(aux->src_fd, aux->xformer); +# else + open_transformer_with_sig(aux->src_fd, aux->xformer, aux->xformer_prog); +# endif + free(aux); return 0; } -int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed) +static transformer_aux_data_t *open_transformer_state(const char *fname, int fail_if_not_compressed) { + transformer_aux_data_t *aux; int fd; fd = open(fname, O_RDONLY); if (fd < 0) - return fd; + return NULL; if (ENABLE_FEATURE_SEAMLESS_LZMA) { /* .lzma has no header/signature, can only detect it by extension */ char *sfx = strrchr(fname, '.'); if (sfx && strcmp(sfx+1, "lzma") == 0) { - open_transformer_with_sig(fd, unpack_lzma_stream, "unlzma"); - return fd; + aux = xzalloc(sizeof(*aux)); + aux->src_fd = fd; + aux->xformer = unpack_lzma_stream; + USE_FOR_NOMMU(aux->xformer_prog = "unlzma";) + return aux; } } - if ((ENABLE_FEATURE_SEAMLESS_GZ) - || (ENABLE_FEATURE_SEAMLESS_BZ2) - || (ENABLE_FEATURE_SEAMLESS_XZ) - ) { - setup_unzip_on_fd(fd, fail_if_not_compressed); + + aux = setup_transformer_on_fd(fd, fail_if_not_compressed); + + return aux; +} + +int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed) +{ + int fd; + transformer_aux_data_t *aux; + + aux = open_transformer_state(fname, fail_if_not_compressed); + if (!aux) + return -1; + + fd = aux->src_fd; + if (aux->xformer) { +# if BB_MMU + open_transformer_with_no_sig(aux->src_fd, aux->xformer); +# else + open_transformer_with_sig(aux->src_fd, aux->xformer, aux->xformer_prog); +# endif } + /* else: the file is not compressed */ + free(aux); return fd; } #endif /* SEAMLESS_COMPRESSION */ + void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) { +#if SEAMLESS_COMPRESSION + transformer_aux_data_t *aux; + char *image; + + aux = open_transformer_state(fname, /*fail_if_not_compressed:*/ 0); + if (!aux) /* file open error */ + return NULL; + + image = NULL; + if (aux->xformer) { + /* In-memory decompression */ + aux->mem_output_size_max = *maxsz_p; + aux->xformer(aux, aux->src_fd, -1); + if (aux->mem_output_buf) { + image = aux->mem_output_buf; + *maxsz_p = aux->mem_output_size; + } + } else { + /* File is not compressed */ + image = xmalloc_read(aux->src_fd, maxsz_p); + } + + if (!image) + bb_perror_msg("read error from '%s'", fname); + close(aux->src_fd); + free(aux); + return image; +#else + /* This version forks a subprocess - much more expensive */ int fd; char *image; @@ -221,6 +341,6 @@ void* FAST_FUNC xmalloc_open_zipped_read if (!image) bb_perror_msg("read error from '%s'", fname); close(fd); - return image; +#endif } diff -d -urpN busybox.0/include/bb_archive.h busybox.1/include/bb_archive.h --- busybox.0/include/bb_archive.h 2014-11-27 23:31:08.000000000 +0100 +++ busybox.1/include/bb_archive.h 2014-12-06 17:07:56.668503776 +0100 @@ -205,6 +205,18 @@ void dealloc_bunzip(bunzip_data *bd) FAS /* Meaning and direction (input/output) of the fields are transformer-specific */ typedef struct transformer_aux_data_t { smallint check_signature; /* most often referenced member */ + + IF_DESKTOP(long long) int FAST_FUNC (*xformer)(struct transformer_aux_data_t *aux, int src_fd, int dst_fd); + USE_FOR_NOMMU(const char *xformer_prog;) + + /* Source */ + int src_fd; + /* Output */ + //int dst_fd; -- so far passed separately + size_t mem_output_size_max; /* if non-zero, decompress to RAM instead of fd */ + size_t mem_output_size; + char *mem_output_buf; + off_t bytes_out; off_t bytes_in; /* used in unzip code only: needs to know packed size */ uint32_t crc32; @@ -212,7 +224,9 @@ typedef struct transformer_aux_data_t { } transformer_aux_data_t; void init_transformer_aux_data(transformer_aux_data_t *aux) FAST_FUNC; -int FAST_FUNC check_signature16(transformer_aux_data_t *aux, int src_fd, unsigned magic16) FAST_FUNC; +ssize_t transformer_write(transformer_aux_data_t *aux, int out, const void *buf, size_t bufsize) FAST_FUNC; +ssize_t xtransformer_write(transformer_aux_data_t *aux, int out, const void *buf, size_t bufsize) FAST_FUNC; +int check_signature16(transformer_aux_data_t *aux, int src_fd, unsigned magic16) FAST_FUNC; IF_DESKTOP(long long) int inflate_unzip(transformer_aux_data_t *aux, int src_fd, int dst_fd) FAST_FUNC; IF_DESKTOP(long long) int unpack_Z_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) FAST_FUNC; @@ -242,7 +256,6 @@ void open_transformer(int fd, const char /* open_transformer_with_no_sig() does not exist on NOMMU */ #endif - POP_SAVED_FUNCTION_VISIBILITY #endif