2006-07-03 01:17:05 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
2003-11-16 04:49:05 +05:30
|
|
|
/*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2003-11-16 04:49:05 +05:30
|
|
|
*/
|
|
|
|
#include "libbb.h"
|
2011-09-22 16:15:14 +05:30
|
|
|
#include "bb_archive.h"
|
2006-04-03 03:20:01 +05:30
|
|
|
|
2014-12-07 05:12:49 +05:30
|
|
|
void FAST_FUNC init_transformer_state(transformer_state_t *xstate)
|
2012-03-06 20:57:48 +05:30
|
|
|
{
|
2014-12-07 05:12:49 +05:30
|
|
|
memset(xstate, 0, sizeof(*xstate));
|
2012-03-06 20:57:48 +05:30
|
|
|
}
|
2012-03-06 20:53:50 +05:30
|
|
|
|
2014-12-07 05:14:00 +05:30
|
|
|
int FAST_FUNC check_signature16(transformer_state_t *xstate, unsigned magic16)
|
2012-03-06 20:57:48 +05:30
|
|
|
{
|
2016-06-20 14:36:42 +05:30
|
|
|
if (!xstate->signature_skipped) {
|
2012-03-06 20:57:48 +05:30
|
|
|
uint16_t magic2;
|
2014-12-07 05:14:00 +05:30
|
|
|
if (full_read(xstate->src_fd, &magic2, 2) != 2 || magic2 != magic16) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("invalid magic");
|
2012-03-06 20:57:48 +05:30
|
|
|
return -1;
|
|
|
|
}
|
2016-06-20 14:36:42 +05:30
|
|
|
xstate->signature_skipped = 2;
|
2012-03-06 20:57:48 +05:30
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2012-03-06 20:53:50 +05:30
|
|
|
|
2014-12-07 05:14:00 +05:30
|
|
|
ssize_t FAST_FUNC transformer_write(transformer_state_t *xstate, const void *buf, size_t bufsize)
|
|
|
|
{
|
|
|
|
ssize_t nwrote;
|
|
|
|
|
|
|
|
if (xstate->mem_output_size_max != 0) {
|
|
|
|
size_t pos = xstate->mem_output_size;
|
|
|
|
size_t size;
|
|
|
|
|
|
|
|
size = (xstate->mem_output_size += bufsize);
|
|
|
|
if (size > xstate->mem_output_size_max) {
|
|
|
|
free(xstate->mem_output_buf);
|
|
|
|
xstate->mem_output_buf = NULL;
|
|
|
|
bb_perror_msg("buffer %u too small", (unsigned)xstate->mem_output_size_max);
|
|
|
|
nwrote = -1;
|
|
|
|
goto ret;
|
|
|
|
}
|
2014-12-07 05:19:55 +05:30
|
|
|
xstate->mem_output_buf = xrealloc(xstate->mem_output_buf, size + 1);
|
2014-12-07 05:14:00 +05:30
|
|
|
memcpy(xstate->mem_output_buf + pos, buf, bufsize);
|
2014-12-07 05:19:55 +05:30
|
|
|
xstate->mem_output_buf[size] = '\0';
|
2014-12-07 05:14:00 +05:30
|
|
|
nwrote = bufsize;
|
|
|
|
} else {
|
|
|
|
nwrote = full_write(xstate->dst_fd, buf, bufsize);
|
|
|
|
if (nwrote != (ssize_t)bufsize) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("write");
|
2014-12-07 05:14:00 +05:30
|
|
|
nwrote = -1;
|
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ret:
|
|
|
|
return nwrote;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssize_t FAST_FUNC xtransformer_write(transformer_state_t *xstate, const void *buf, size_t bufsize)
|
|
|
|
{
|
|
|
|
ssize_t nwrote = transformer_write(xstate, buf, bufsize);
|
|
|
|
if (nwrote != (ssize_t)bufsize) {
|
|
|
|
xfunc_die();
|
|
|
|
}
|
|
|
|
return nwrote;
|
|
|
|
}
|
|
|
|
|
2012-03-06 21:03:42 +05:30
|
|
|
void check_errors_in_children(int signo)
|
|
|
|
{
|
|
|
|
int status;
|
|
|
|
|
|
|
|
if (!signo) {
|
|
|
|
/* block waiting for any child */
|
|
|
|
if (wait(&status) < 0)
|
2013-02-28 21:08:25 +05:30
|
|
|
//FIXME: check EINTR?
|
2012-03-06 21:03:42 +05:30
|
|
|
return; /* probably there are no children */
|
|
|
|
goto check_status;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait for any child without blocking */
|
|
|
|
for (;;) {
|
|
|
|
if (wait_any_nohang(&status) < 0)
|
2013-02-28 21:08:25 +05:30
|
|
|
//FIXME: check EINTR?
|
2012-03-06 21:03:42 +05:30
|
|
|
/* wait failed?! I'm confused... */
|
|
|
|
return;
|
|
|
|
check_status:
|
2013-02-28 21:08:25 +05:30
|
|
|
/*if (WIFEXITED(status) && WEXITSTATUS(status) == 0)*/
|
|
|
|
/* On Linux, the above can be checked simply as: */
|
|
|
|
if (status == 0)
|
2012-03-06 21:03:42 +05:30
|
|
|
/* this child exited with 0 */
|
|
|
|
continue;
|
2013-02-28 21:08:25 +05:30
|
|
|
/* Cannot happen:
|
|
|
|
if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???;
|
|
|
|
*/
|
2012-03-06 21:03:42 +05:30
|
|
|
bb_got_signal = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-16 04:49:05 +05:30
|
|
|
/* transformer(), more than meets the eye */
|
2012-03-06 20:57:48 +05:30
|
|
|
#if BB_MMU
|
2014-12-07 05:14:00 +05:30
|
|
|
void FAST_FUNC fork_transformer(int fd,
|
2016-06-20 14:36:42 +05:30
|
|
|
int signature_skipped,
|
2014-12-07 05:14:00 +05:30
|
|
|
IF_DESKTOP(long long) int FAST_FUNC (*transformer)(transformer_state_t *xstate)
|
2012-03-06 20:57:48 +05:30
|
|
|
)
|
|
|
|
#else
|
2014-12-07 05:14:00 +05:30
|
|
|
void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
|
2012-03-06 20:57:48 +05:30
|
|
|
#endif
|
2003-11-16 04:49:05 +05:30
|
|
|
{
|
2008-02-16 18:50:56 +05:30
|
|
|
struct fd_pair fd_pipe;
|
2003-11-16 04:49:05 +05:30
|
|
|
int pid;
|
|
|
|
|
2008-02-16 18:50:56 +05:30
|
|
|
xpiped_pair(fd_pipe);
|
2010-07-04 19:02:38 +05:30
|
|
|
pid = BB_MMU ? xfork() : xvfork();
|
2003-11-16 04:49:05 +05:30
|
|
|
if (pid == 0) {
|
2010-07-04 19:02:38 +05:30
|
|
|
/* Child */
|
2008-07-10 23:13:01 +05:30
|
|
|
close(fd_pipe.rd); /* we don't want to read from the parent */
|
2006-10-14 07:53:43 +05:30
|
|
|
// FIXME: error check?
|
2007-09-05 17:18:32 +05:30
|
|
|
#if BB_MMU
|
2012-03-06 20:57:48 +05:30
|
|
|
{
|
2013-11-19 19:14:04 +05:30
|
|
|
IF_DESKTOP(long long) int r;
|
2014-12-07 05:12:49 +05:30
|
|
|
transformer_state_t xstate;
|
|
|
|
init_transformer_state(&xstate);
|
2016-06-20 14:36:42 +05:30
|
|
|
xstate.signature_skipped = signature_skipped;
|
2014-12-07 05:14:00 +05:30
|
|
|
xstate.src_fd = fd;
|
|
|
|
xstate.dst_fd = fd_pipe.wr;
|
|
|
|
r = transformer(&xstate);
|
2012-03-06 20:57:48 +05:30
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) {
|
|
|
|
close(fd_pipe.wr); /* send EOF */
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
/* must be _exit! bug was actually seen here */
|
2013-11-19 19:14:04 +05:30
|
|
|
_exit(/*error if:*/ r < 0);
|
2007-09-05 01:03:22 +05:30
|
|
|
}
|
2007-09-05 17:18:32 +05:30
|
|
|
#else
|
2007-11-12 07:43:12 +05:30
|
|
|
{
|
|
|
|
char *argv[4];
|
2008-07-10 23:13:01 +05:30
|
|
|
xmove_fd(fd, 0);
|
2008-02-16 18:50:56 +05:30
|
|
|
xmove_fd(fd_pipe.wr, 1);
|
2007-11-12 07:43:12 +05:30
|
|
|
argv[0] = (char*)transform_prog;
|
|
|
|
argv[1] = (char*)"-cf";
|
|
|
|
argv[2] = (char*)"-";
|
|
|
|
argv[3] = NULL;
|
|
|
|
BB_EXECVP(transform_prog, argv);
|
2009-04-22 02:10:51 +05:30
|
|
|
bb_perror_msg_and_die("can't execute '%s'", transform_prog);
|
2007-11-12 07:43:12 +05:30
|
|
|
}
|
2007-09-05 17:18:32 +05:30
|
|
|
#endif
|
2006-10-14 07:53:43 +05:30
|
|
|
/* notreached */
|
2003-11-16 04:49:05 +05:30
|
|
|
}
|
2003-11-19 03:01:19 +05:30
|
|
|
|
2003-11-16 04:49:05 +05:30
|
|
|
/* parent process */
|
2008-07-10 23:13:01 +05:30
|
|
|
close(fd_pipe.wr); /* don't want to write to the child */
|
|
|
|
xmove_fd(fd_pipe.rd, fd);
|
2003-11-16 04:49:05 +05:30
|
|
|
}
|
2012-03-06 20:53:50 +05:30
|
|
|
|
|
|
|
|
2012-03-06 20:57:48 +05:30
|
|
|
#if SEAMLESS_COMPRESSION
|
|
|
|
|
2012-03-06 20:53:50 +05:30
|
|
|
/* Used by e.g. rpm which gives us a fd without filename,
|
|
|
|
* thus we can't guess the format from filename's extension.
|
|
|
|
*/
|
2014-12-07 05:14:00 +05:30
|
|
|
static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_compressed)
|
2012-03-06 20:53:50 +05:30
|
|
|
{
|
2014-12-07 05:14:00 +05:30
|
|
|
transformer_state_t *xstate;
|
|
|
|
|
|
|
|
xstate = xzalloc(sizeof(*xstate));
|
|
|
|
xstate->src_fd = fd;
|
2012-03-06 20:53:50 +05:30
|
|
|
|
|
|
|
/* .gz and .bz2 both have 2-byte signature, and their
|
|
|
|
* unpack_XXX_stream wants this header skipped. */
|
2019-05-24 20:33:28 +05:30
|
|
|
xstate->signature_skipped = 2;
|
|
|
|
xread(fd, xstate->magic.b16, 2);
|
2012-03-06 20:53:50 +05:30
|
|
|
if (ENABLE_FEATURE_SEAMLESS_GZ
|
2019-05-24 20:33:28 +05:30
|
|
|
&& xstate->magic.b16[0] == GZIP_MAGIC
|
2012-03-06 20:53:50 +05:30
|
|
|
) {
|
2014-12-07 05:14:00 +05:30
|
|
|
xstate->xformer = unpack_gz_stream;
|
|
|
|
USE_FOR_NOMMU(xstate->xformer_prog = "gunzip";)
|
2012-03-06 20:53:50 +05:30
|
|
|
goto found_magic;
|
|
|
|
}
|
2015-05-03 22:10:12 +05:30
|
|
|
if (ENABLE_FEATURE_SEAMLESS_Z
|
2019-05-24 20:33:28 +05:30
|
|
|
&& xstate->magic.b16[0] == COMPRESS_MAGIC
|
2015-05-03 22:10:12 +05:30
|
|
|
) {
|
|
|
|
xstate->xformer = unpack_Z_stream;
|
|
|
|
USE_FOR_NOMMU(xstate->xformer_prog = "uncompress";)
|
|
|
|
goto found_magic;
|
|
|
|
}
|
2012-03-06 20:53:50 +05:30
|
|
|
if (ENABLE_FEATURE_SEAMLESS_BZ2
|
2019-05-24 20:33:28 +05:30
|
|
|
&& xstate->magic.b16[0] == BZIP2_MAGIC
|
2012-03-06 20:53:50 +05:30
|
|
|
) {
|
2014-12-07 05:14:00 +05:30
|
|
|
xstate->xformer = unpack_bz2_stream;
|
|
|
|
USE_FOR_NOMMU(xstate->xformer_prog = "bunzip2";)
|
2012-03-06 20:53:50 +05:30
|
|
|
goto found_magic;
|
|
|
|
}
|
|
|
|
if (ENABLE_FEATURE_SEAMLESS_XZ
|
2019-05-24 20:33:28 +05:30
|
|
|
&& xstate->magic.b16[0] == XZ_MAGIC1
|
2012-03-06 20:53:50 +05:30
|
|
|
) {
|
2019-05-24 20:33:28 +05:30
|
|
|
uint32_t v32;
|
2016-06-20 14:36:42 +05:30
|
|
|
xstate->signature_skipped = 6;
|
2019-05-24 20:33:28 +05:30
|
|
|
xread(fd, &xstate->magic.b16[1], 4);
|
|
|
|
move_from_unaligned32(v32, &xstate->magic.b16[1]);
|
|
|
|
if (v32 == XZ_MAGIC2) {
|
2014-12-07 05:14:00 +05:30
|
|
|
xstate->xformer = unpack_xz_stream;
|
|
|
|
USE_FOR_NOMMU(xstate->xformer_prog = "unxz";)
|
2012-03-06 20:53:50 +05:30
|
|
|
goto found_magic;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No known magic seen */
|
2014-02-02 06:36:38 +05:30
|
|
|
if (fail_if_not_compressed)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("no gzip"
|
2012-03-06 20:53:50 +05:30
|
|
|
IF_FEATURE_SEAMLESS_BZ2("/bzip2")
|
|
|
|
IF_FEATURE_SEAMLESS_XZ("/xz")
|
|
|
|
" magic");
|
2014-12-07 05:14:00 +05:30
|
|
|
|
|
|
|
/* 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(xstate->xformer = copy_stream;)
|
|
|
|
// USE_FOR_NOMMU(xstate->xformer_prog = "cat";)
|
|
|
|
|
2016-06-20 14:36:42 +05:30
|
|
|
found_magic:
|
2014-12-07 05:14:00 +05:30
|
|
|
return xstate;
|
|
|
|
}
|
|
|
|
|
2017-08-10 14:05:08 +05:30
|
|
|
static void fork_transformer_and_free(transformer_state_t *xstate)
|
2014-12-07 05:14:00 +05:30
|
|
|
{
|
2012-03-06 20:57:48 +05:30
|
|
|
# if BB_MMU
|
2014-12-07 05:14:00 +05:30
|
|
|
fork_transformer_with_no_sig(xstate->src_fd, xstate->xformer);
|
2012-03-06 20:57:48 +05:30
|
|
|
# else
|
2016-06-20 14:36:42 +05:30
|
|
|
/* NOMMU version of fork_transformer execs
|
|
|
|
* an external unzipper that wants
|
|
|
|
* file position at the start of the file.
|
|
|
|
*/
|
2017-08-22 16:04:03 +05:30
|
|
|
xlseek(xstate->src_fd, - xstate->signature_skipped, SEEK_CUR);
|
2016-06-20 14:36:42 +05:30
|
|
|
xstate->signature_skipped = 0;
|
2014-12-07 05:14:00 +05:30
|
|
|
fork_transformer_with_sig(xstate->src_fd, xstate->xformer, xstate->xformer_prog);
|
2012-03-06 20:53:50 +05:30
|
|
|
# endif
|
2014-12-07 05:14:00 +05:30
|
|
|
free(xstate);
|
2017-08-10 14:05:08 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
/* 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_state_t *xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
|
|
|
|
|
|
|
|
if (!xstate->xformer) {
|
|
|
|
free(xstate);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fork_transformer_and_free(xstate);
|
2012-03-06 20:57:48 +05:30
|
|
|
return 0;
|
2012-03-06 20:53:50 +05:30
|
|
|
}
|
2017-08-10 14:05:08 +05:30
|
|
|
#if ENABLE_FEATURE_SEAMLESS_LZMA
|
|
|
|
/* ...and custom version for LZMA */
|
|
|
|
void FAST_FUNC setup_lzma_on_fd(int fd)
|
|
|
|
{
|
|
|
|
transformer_state_t *xstate = xzalloc(sizeof(*xstate));
|
|
|
|
xstate->src_fd = fd;
|
|
|
|
xstate->xformer = unpack_lzma_stream;
|
|
|
|
USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";)
|
|
|
|
fork_transformer_and_free(xstate);
|
|
|
|
}
|
|
|
|
#endif
|
2012-03-06 20:53:50 +05:30
|
|
|
|
2014-12-07 05:14:00 +05:30
|
|
|
static transformer_state_t *open_transformer(const char *fname, int fail_if_not_compressed)
|
2012-03-06 20:53:50 +05:30
|
|
|
{
|
2014-12-07 05:14:00 +05:30
|
|
|
transformer_state_t *xstate;
|
2012-03-06 20:53:50 +05:30
|
|
|
int fd;
|
|
|
|
|
|
|
|
fd = open(fname, O_RDONLY);
|
|
|
|
if (fd < 0)
|
2014-12-07 05:14:00 +05:30
|
|
|
return NULL;
|
2012-03-06 20:53:50 +05:30
|
|
|
|
2014-01-10 18:36:57 +05:30
|
|
|
if (ENABLE_FEATURE_SEAMLESS_LZMA) {
|
|
|
|
/* .lzma has no header/signature, can only detect it by extension */
|
2018-11-27 15:56:48 +05:30
|
|
|
if (is_suffixed_with(fname, ".lzma")) {
|
2014-12-07 05:14:00 +05:30
|
|
|
xstate = xzalloc(sizeof(*xstate));
|
|
|
|
xstate->src_fd = fd;
|
|
|
|
xstate->xformer = unpack_lzma_stream;
|
|
|
|
USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";)
|
|
|
|
return xstate;
|
2012-03-06 20:53:50 +05:30
|
|
|
}
|
|
|
|
}
|
2014-12-07 05:14:00 +05:30
|
|
|
|
|
|
|
xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
|
|
|
|
|
|
|
|
return xstate;
|
|
|
|
}
|
|
|
|
|
|
|
|
int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed)
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
transformer_state_t *xstate;
|
|
|
|
|
|
|
|
xstate = open_transformer(fname, fail_if_not_compressed);
|
|
|
|
if (!xstate)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
fd = xstate->src_fd;
|
|
|
|
# if BB_MMU
|
2016-06-20 15:12:00 +05:30
|
|
|
if (xstate->xformer) {
|
|
|
|
fork_transformer_with_no_sig(fd, xstate->xformer);
|
|
|
|
} else {
|
|
|
|
/* the file is not compressed */
|
2016-06-20 14:36:42 +05:30
|
|
|
xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
|
|
|
|
xstate->signature_skipped = 0;
|
2014-01-10 18:36:57 +05:30
|
|
|
}
|
2016-06-20 15:12:00 +05:30
|
|
|
# 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);
|
2016-06-20 19:58:53 +05:30
|
|
|
} /* else: the file is not compressed */
|
2016-06-20 15:12:00 +05:30
|
|
|
# endif
|
2012-03-06 20:53:50 +05:30
|
|
|
|
2014-12-07 05:14:00 +05:30
|
|
|
free(xstate);
|
2012-03-06 20:53:50 +05:30
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
|
|
|
|
void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p)
|
|
|
|
{
|
2014-12-07 05:14:00 +05:30
|
|
|
# if 1
|
|
|
|
transformer_state_t *xstate;
|
|
|
|
char *image;
|
|
|
|
|
|
|
|
xstate = open_transformer(fname, /*fail_if_not_compressed:*/ 0);
|
|
|
|
if (!xstate) /* file open error */
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
image = NULL;
|
|
|
|
if (xstate->xformer) {
|
|
|
|
/* In-memory decompression */
|
|
|
|
xstate->mem_output_size_max = maxsz_p ? *maxsz_p : (size_t)(INT_MAX - 4095);
|
|
|
|
xstate->xformer(xstate);
|
|
|
|
if (xstate->mem_output_buf) {
|
|
|
|
image = xstate->mem_output_buf;
|
|
|
|
if (maxsz_p)
|
|
|
|
*maxsz_p = xstate->mem_output_size;
|
|
|
|
}
|
|
|
|
} else {
|
2019-05-24 20:33:28 +05:30
|
|
|
/* File is not compressed.
|
|
|
|
* We already read first few bytes, account for that.
|
2019-05-26 17:16:49 +05:30
|
|
|
* Example where it happens:
|
2019-05-24 20:33:28 +05:30
|
|
|
* "modinfo MODULE.ko" (not compressed)
|
|
|
|
* open("MODULE.ko", O_RDONLY|O_LARGEFILE) = 4
|
|
|
|
* read(4, "\177E", 2) = 2
|
|
|
|
* fstat64(4, ...)
|
|
|
|
* mmap(...)
|
|
|
|
* read(4, "LF\2\1\1\0\0\0\0"...
|
|
|
|
* ...and we avoided seeking on the fd! :)
|
|
|
|
*/
|
|
|
|
image = xmalloc_read_with_initial_buf(
|
|
|
|
xstate->src_fd,
|
|
|
|
maxsz_p,
|
|
|
|
xmemdup(&xstate->magic, xstate->signature_skipped),
|
|
|
|
xstate->signature_skipped
|
|
|
|
);
|
2019-05-26 17:13:06 +05:30
|
|
|
xstate->signature_skipped = 0;
|
2014-12-07 05:14:00 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
if (!image)
|
|
|
|
bb_perror_msg("read error from '%s'", fname);
|
|
|
|
close(xstate->src_fd);
|
|
|
|
free(xstate);
|
|
|
|
return image;
|
|
|
|
# else
|
|
|
|
/* This version forks a subprocess - much more expensive */
|
2012-03-06 20:53:50 +05:30
|
|
|
int fd;
|
|
|
|
char *image;
|
|
|
|
|
2014-02-02 06:36:38 +05:30
|
|
|
fd = open_zipped(fname, /*fail_if_not_compressed:*/ 0);
|
2012-03-06 20:53:50 +05:30
|
|
|
if (fd < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
image = xmalloc_read(fd, maxsz_p);
|
|
|
|
if (!image)
|
|
|
|
bb_perror_msg("read error from '%s'", fname);
|
|
|
|
close(fd);
|
|
|
|
return image;
|
2014-12-07 05:14:00 +05:30
|
|
|
# endif
|
2012-03-06 20:53:50 +05:30
|
|
|
}
|
2014-12-07 05:14:00 +05:30
|
|
|
|
|
|
|
#endif /* SEAMLESS_COMPRESSION */
|