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>
143 lines
4.5 KiB
C
143 lines
4.5 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Copyright 2001 Glenn McGrath.
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
#include "libbb.h"
|
|
#include "bb_archive.h"
|
|
#include "ar.h"
|
|
|
|
/* WARNING: Clobbers str[len], so fields must be read in reverse order! */
|
|
static unsigned read_num(char *str, int base, int len)
|
|
{
|
|
int err;
|
|
|
|
/* ar fields are fixed length text strings (padded with spaces).
|
|
* Ensure bb_strtou doesn't read past the field in case the full
|
|
* width is used. */
|
|
str[len] = 0;
|
|
|
|
/* This code works because
|
|
* on misformatted numbers bb_strtou returns all-ones */
|
|
err = bb_strtou(str, NULL, base);
|
|
if (err == -1)
|
|
bb_simple_error_msg_and_die("invalid ar header");
|
|
return err;
|
|
}
|
|
|
|
char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
|
|
{
|
|
file_header_t *typed = archive_handle->file_header;
|
|
unsigned size;
|
|
union {
|
|
char raw[60];
|
|
struct ar_header formatted;
|
|
} ar;
|
|
|
|
/* dont use xread as we want to handle the error ourself */
|
|
if (read(archive_handle->src_fd, ar.raw, 60) != 60) {
|
|
/* End Of File */
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
/* ar header starts on an even byte (2 byte aligned)
|
|
* '\n' is used for padding
|
|
*/
|
|
if (ar.raw[0] == '\n') {
|
|
/* fix up the header, we started reading 1 byte too early */
|
|
memmove(ar.raw, &ar.raw[1], 59);
|
|
ar.raw[59] = xread_char(archive_handle->src_fd);
|
|
archive_handle->offset++;
|
|
}
|
|
archive_handle->offset += 60;
|
|
|
|
if (ar.formatted.magic[0] != '`' || ar.formatted.magic[1] != '\n')
|
|
bb_simple_error_msg_and_die("invalid ar header");
|
|
|
|
/*
|
|
* Note that the fields MUST be read in reverse order as
|
|
* read_num() clobbers the next byte after the field!
|
|
* Order is: name, date, uid, gid, mode, size, magic.
|
|
*/
|
|
typed->size = size = read_num(ar.formatted.size, 10,
|
|
sizeof(ar.formatted.size));
|
|
|
|
/* special filenames have '/' as the first character */
|
|
if (ar.formatted.name[0] == '/') {
|
|
if (ar.formatted.name[1] == ' ') {
|
|
/* This is the index of symbols in the file for compilers */
|
|
data_skip(archive_handle);
|
|
archive_handle->offset += size;
|
|
return get_header_ar(archive_handle); /* Return next header */
|
|
}
|
|
#if ENABLE_FEATURE_AR_LONG_FILENAMES
|
|
if (ar.formatted.name[1] == '/') {
|
|
/* If the second char is a '/' then this entries data section
|
|
* stores long filename for multiple entries, they are stored
|
|
* in static variable long_names for use in future entries
|
|
*/
|
|
archive_handle->ar__long_name_size = size;
|
|
free(archive_handle->ar__long_names);
|
|
archive_handle->ar__long_names = xzalloc(size + 1);
|
|
xread(archive_handle->src_fd, archive_handle->ar__long_names, size);
|
|
archive_handle->offset += size;
|
|
/* Return next header */
|
|
return get_header_ar(archive_handle);
|
|
}
|
|
#else
|
|
bb_simple_error_msg_and_die("long filenames not supported");
|
|
#endif
|
|
}
|
|
/* Only size is always present, the rest may be missing in
|
|
* long filename pseudo file. Thus we decode the rest
|
|
* after dealing with long filename pseudo file.
|
|
*/
|
|
typed->mode = read_num(ar.formatted.mode, 8, sizeof(ar.formatted.mode));
|
|
typed->gid = read_num(ar.formatted.gid, 10, sizeof(ar.formatted.gid));
|
|
typed->uid = read_num(ar.formatted.uid, 10, sizeof(ar.formatted.uid));
|
|
typed->mtime = read_num(ar.formatted.date, 10, sizeof(ar.formatted.date));
|
|
|
|
#if ENABLE_FEATURE_AR_LONG_FILENAMES
|
|
if (ar.formatted.name[0] == '/') {
|
|
unsigned long_offset;
|
|
|
|
/* The number after the '/' indicates the offset in the ar data section
|
|
* (saved in ar__long_names) that contains the real filename */
|
|
long_offset = read_num(&ar.formatted.name[1], 10,
|
|
sizeof(ar.formatted.name) - 1);
|
|
if (long_offset >= archive_handle->ar__long_name_size) {
|
|
bb_simple_error_msg_and_die("can't resolve long filename");
|
|
}
|
|
typed->name = xstrdup(archive_handle->ar__long_names + long_offset);
|
|
} else
|
|
#endif
|
|
{
|
|
/* short filenames */
|
|
typed->name = xstrndup(ar.formatted.name, 16);
|
|
}
|
|
|
|
typed->name[strcspn(typed->name, " /")] = '\0';
|
|
|
|
if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
|
|
archive_handle->action_header(typed);
|
|
#if ENABLE_DPKG || ENABLE_DPKG_DEB
|
|
if (archive_handle->dpkg__sub_archive) {
|
|
struct archive_handle_t *sa = archive_handle->dpkg__sub_archive;
|
|
while (archive_handle->dpkg__action_data_subarchive(sa) == EXIT_SUCCESS)
|
|
continue;
|
|
create_links_from_list(sa->link_placeholders);
|
|
} else
|
|
#endif
|
|
archive_handle->action_data(archive_handle);
|
|
} else {
|
|
data_skip(archive_handle);
|
|
}
|
|
|
|
archive_handle->offset += typed->size;
|
|
/* Set the file pointer to the correct spot, we may have been reading a compressed file */
|
|
lseek(archive_handle->src_fd, archive_handle->offset, SEEK_SET);
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|