6937487be7
Back in 2007, commit 0c97c9d437
("'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>
137 lines
3.7 KiB
C
137 lines
3.7 KiB
C
/*
|
|
* This file uses XZ Embedded library code which is written
|
|
* by Lasse Collin <lasse.collin@tukaani.org>
|
|
* and Igor Pavlov <http://7-zip.org/>
|
|
*
|
|
* See README file in unxz/ directory for more information.
|
|
*
|
|
* This file is:
|
|
* Copyright (C) 2010 Denys Vlasenko <vda.linux@googlemail.com>
|
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
|
*/
|
|
#include "libbb.h"
|
|
#include "bb_archive.h"
|
|
|
|
#define XZ_FUNC FAST_FUNC
|
|
#define XZ_EXTERN static
|
|
|
|
#define XZ_DEC_DYNALLOC
|
|
|
|
/* Skip check (rather than fail) of unsupported hash functions */
|
|
#define XZ_DEC_ANY_CHECK 1
|
|
|
|
/* We use our own crc32 function */
|
|
#define XZ_INTERNAL_CRC32 0
|
|
static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
|
|
{
|
|
return ~crc32_block_endian0(~crc, buf, size, global_crc32_table);
|
|
}
|
|
|
|
/* We use arch-optimized unaligned fixed-endian accessors.
|
|
* They have been moved to libbb (proved to be useful elsewhere as well),
|
|
* just check that we have them defined:
|
|
*/
|
|
#if !defined(get_unaligned_le32) \
|
|
|| !defined(get_unaligned_be32) \
|
|
|| !defined(put_unaligned_le32) \
|
|
|| !defined(put_unaligned_be32)
|
|
# error get_unaligned_le32 accessors are not defined
|
|
#endif
|
|
|
|
#include "unxz/xz_dec_bcj.c"
|
|
#include "unxz/xz_dec_lzma2.c"
|
|
#include "unxz/xz_dec_stream.c"
|
|
|
|
IF_DESKTOP(long long) int FAST_FUNC
|
|
unpack_xz_stream(transformer_state_t *xstate)
|
|
{
|
|
enum xz_ret xz_result;
|
|
struct xz_buf iobuf;
|
|
struct xz_dec *state;
|
|
unsigned char *membuf;
|
|
IF_DESKTOP(long long) int total = 0;
|
|
|
|
if (!global_crc32_table)
|
|
global_crc32_new_table_le();
|
|
|
|
memset(&iobuf, 0, sizeof(iobuf));
|
|
membuf = xmalloc(2 * BUFSIZ);
|
|
iobuf.in = membuf;
|
|
iobuf.out = membuf + BUFSIZ;
|
|
iobuf.out_size = BUFSIZ;
|
|
|
|
if (!xstate || xstate->signature_skipped) {
|
|
/* Preload XZ file signature */
|
|
strcpy((char*)membuf, HEADER_MAGIC);
|
|
iobuf.in_size = HEADER_MAGIC_SIZE;
|
|
} /* else: let xz code read & check it */
|
|
|
|
/* Limit memory usage to about 64 MiB. */
|
|
state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
|
|
|
|
xz_result = X_OK;
|
|
while (1) {
|
|
if (iobuf.in_pos == iobuf.in_size) {
|
|
int rd = safe_read(xstate->src_fd, membuf, BUFSIZ);
|
|
if (rd < 0) {
|
|
bb_simple_error_msg(bb_msg_read_error);
|
|
total = -1;
|
|
break;
|
|
}
|
|
if (rd == 0 && xz_result == XZ_STREAM_END)
|
|
break;
|
|
iobuf.in_size = rd;
|
|
iobuf.in_pos = 0;
|
|
}
|
|
if (xz_result == XZ_STREAM_END) {
|
|
/*
|
|
* Try to start decoding next concatenated stream.
|
|
* Stream padding must always be a multiple of four
|
|
* bytes to preserve four-byte alignment. To keep the
|
|
* code slightly smaller, we aren't as strict here as
|
|
* the .xz spec requires. We just skip all zero-bytes
|
|
* without checking the alignment and thus can accept
|
|
* files that aren't valid, e.g. the XZ utils test
|
|
* files bad-0pad-empty.xz and bad-0catpad-empty.xz.
|
|
*/
|
|
do {
|
|
if (membuf[iobuf.in_pos] != 0) {
|
|
xz_dec_reset(state);
|
|
goto do_run;
|
|
}
|
|
iobuf.in_pos++;
|
|
} while (iobuf.in_pos < iobuf.in_size);
|
|
}
|
|
do_run:
|
|
// bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
|
|
// iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
|
|
xz_result = xz_dec_run(state, &iobuf);
|
|
// bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
|
|
// iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
|
|
if (iobuf.out_pos) {
|
|
xtransformer_write(xstate, iobuf.out, iobuf.out_pos);
|
|
IF_DESKTOP(total += iobuf.out_pos;)
|
|
iobuf.out_pos = 0;
|
|
}
|
|
if (xz_result == XZ_STREAM_END) {
|
|
/*
|
|
* Can just "break;" here, if not for concatenated
|
|
* .xz streams.
|
|
* Checking for padding may require buffer
|
|
* replenishment. Can't do it here.
|
|
*/
|
|
continue;
|
|
}
|
|
if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
|
|
bb_simple_error_msg("corrupted data");
|
|
total = -1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
xz_dec_end(state);
|
|
free(membuf);
|
|
|
|
return total;
|
|
}
|