busybox/coreutils/od_bloaty.c

1396 lines
37 KiB
C
Raw Normal View History

/* od -- dump files in octal and other formats
Copyright (C) 92, 1995-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* Written by Jim Meyering. */
/* Busyboxed by Denys Vlasenko, based on od.c from coreutils-5.2.1 */
/* #include "libbb.h" - done in od.c */
#include "common_bufsiz.h"
#define assert(a) ((void)0)
//usage:#if ENABLE_DESKTOP
//usage:#define od_trivial_usage
//usage: "[-abcdfhilovxs] [-t TYPE] [-A RADIX] [-N SIZE] [-j SKIP] [-S MINSTR] [-w WIDTH] [FILE]..."
// We don't support:
// ... [FILE] [[+]OFFSET[.][b]]
// Support is buggy for:
// od --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.][b]]
//usage:#define od_full_usage "\n\n"
//usage: "Print FILEs (or stdin) unambiguously, as octal bytes by default"
//usage:#endif
enum {
OPT_A = 1 << 0,
OPT_N = 1 << 1,
OPT_a = 1 << 2,
OPT_b = 1 << 3,
OPT_c = 1 << 4,
OPT_d = 1 << 5,
OPT_f = 1 << 6,
OPT_h = 1 << 7,
OPT_i = 1 << 8,
OPT_j = 1 << 9,
OPT_l = 1 << 10,
OPT_o = 1 << 11,
OPT_t = 1 << 12,
/* When zero and two or more consecutive blocks are equal, format
only the first block and output an asterisk alone on the following
line to indicate that identical blocks have been elided: */
OPT_v = 1 << 13,
OPT_x = 1 << 14,
OPT_s = 1 << 15,
OPT_S = 1 << 16,
OPT_w = 1 << 17,
OPT_traditional = (1 << 18) * ENABLE_LONG_OPTS,
};
getopt32: remove applet_long_options FEATURE_GETOPT_LONG made dependent on LONG_OPTS. The folloving options are removed, now LONG_OPTS enables long options for affected applets: FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS They either had a small number of long options, or their long options are essential. Example: upstream addgroup and adduser have ONLY longopts, we should probably go further and get rid of non-standard short options. To this end, make addgroup and adduser "select LONG_OPTS". We had this breakage caused by us even in our own package! #if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP /* We try to use --gid, not -g, because "standard" addgroup * has no short option -g, it has only long --gid. */ argv[1] = (char*)"--gid"; #else /* Breaks if system in fact does NOT use busybox addgroup */ argv[1] = (char*)"-g"; #endif xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS. hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime Shorten help texts by omitting long option when short opt alternative exists. Reduction of size comes from the fact that store of an immediate (an address of longopts) to a fixed address (global variable) is a longer insn than pushing that immediate or passing it in a register. This effect is CPU-agnostic. function old new delta getopt32 1350 22 -1328 vgetopt32 - 1318 +1318 getopt32long - 24 +24 tftpd_main 562 567 +5 scan_recursive 376 380 +4 collect_cpu 545 546 +1 date_main 1096 1095 -1 hostname_main 262 259 -3 uname_main 259 255 -4 setpriv_main 362 358 -4 rmdir_main 191 187 -4 mv_main 562 558 -4 ipcalc_main 548 544 -4 ifenslave_main 641 637 -4 gzip_main 192 188 -4 gunzip_main 77 73 -4 fsfreeze_main 81 77 -4 flock_main 318 314 -4 deluser_main 337 333 -4 cp_main 374 370 -4 chown_main 175 171 -4 applet_long_options 4 - -4 xargs_main 894 889 -5 wget_main 2540 2535 -5 udhcpc_main 2767 2762 -5 touch_main 436 431 -5 tar_main 1014 1009 -5 start_stop_daemon_main 1033 1028 -5 sed_main 682 677 -5 script_main 1082 1077 -5 run_parts_main 330 325 -5 rtcwake_main 459 454 -5 od_main 2169 2164 -5 nl_main 201 196 -5 modprobe_main 773 768 -5 mkdir_main 160 155 -5 ls_main 568 563 -5 install_main 773 768 -5 hwclock_main 411 406 -5 getopt_main 622 617 -5 fstrim_main 256 251 -5 env_main 198 193 -5 dumpleases_main 635 630 -5 dpkg_main 3991 3986 -5 diff_main 1355 1350 -5 cryptpw_main 233 228 -5 cpio_main 593 588 -5 conspy_main 1135 1130 -5 chpasswd_main 313 308 -5 adduser_main 887 882 -5 addgroup_main 416 411 -5 ftpgetput_main 351 345 -6 get_terminal_width_height 242 234 -8 expand_main 690 680 -10 static.expand_longopts 18 - -18 static.unexpand_longopts 27 - -27 mkdir_longopts 28 - -28 env_longopts 30 - -30 static.ifenslave_longopts 34 - -34 mv_longopts 46 - -46 static.rmdir_longopts 48 - -48 packed_usage 31739 31687 -52 ------------------------------------------------------------------------------ (add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes text data bss dec hex filename 915681 485 6880 923046 e15a6 busybox_old 915428 485 6876 922789 e14a5 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
#define OD_GETOPT32() getopt32long(argv, \
"A:N:abcdfhij:lot:*vxsS:w:+:", od_longopts, \
/* -w with optional param */ \
/* -S was -s and also had optional parameter */ \
/* but in coreutils 6.3 it was renamed and now has */ \
/* _mandatory_ parameter */ \
&str_A, &str_N, &str_j, &lst_t, &str_S, &G.bytes_per_block)
/* Check for 0x7f is a coreutils 6.3 addition */
#define ISPRINT(c) (((c) >= ' ') && (c) < 0x7f)
typedef long double longdouble_t;
typedef unsigned long long ulonglong_t;
typedef long long llong;
#if ENABLE_LFS
# define xstrtooff_sfx xstrtoull_sfx
#else
# define xstrtooff_sfx xstrtoul_sfx
#endif
/* The default number of input bytes per output line. */
#define DEFAULT_BYTES_PER_BLOCK 16
/* The number of decimal digits of precision in a float. */
#ifndef FLT_DIG
# define FLT_DIG 7
#endif
/* The number of decimal digits of precision in a double. */
#ifndef DBL_DIG
# define DBL_DIG 15
#endif
/* The number of decimal digits of precision in a long double. */
#ifndef LDBL_DIG
# define LDBL_DIG DBL_DIG
#endif
enum size_spec {
NO_SIZE,
CHAR,
SHORT,
INT,
LONG,
LONG_LONG,
FLOAT_SINGLE,
FLOAT_DOUBLE,
FLOAT_LONG_DOUBLE,
N_SIZE_SPECS
};
enum output_format {
SIGNED_DECIMAL,
UNSIGNED_DECIMAL,
OCTAL,
HEXADECIMAL,
FLOATING_POINT,
NAMED_CHARACTER,
CHARACTER
};
/* Each output format specification (from '-t spec' or from
old-style options) is represented by one of these structures. */
struct tspec {
enum output_format fmt;
enum size_spec size;
void (*print_function) (size_t, const char *, const char *);
char *fmt_string;
int hexl_mode_trailer;
int field_width;
};
/* Convert the number of 8-bit bytes of a binary representation to
the number of characters (digits + sign if the type is signed)
required to represent the same quantity in the specified base/type.
For example, a 32-bit (4-byte) quantity may require a field width
as wide as the following for these types:
11 unsigned octal
11 signed decimal
10 unsigned decimal
8 unsigned hexadecimal */
static const uint8_t bytes_to_oct_digits[] ALIGN1 =
{0, 3, 6, 8, 11, 14, 16, 19, 22, 25, 27, 30, 32, 35, 38, 41, 43};
static const uint8_t bytes_to_signed_dec_digits[] ALIGN1 =
{1, 4, 6, 8, 11, 13, 16, 18, 20, 23, 25, 28, 30, 33, 35, 37, 40};
static const uint8_t bytes_to_unsigned_dec_digits[] ALIGN1 =
{0, 3, 5, 8, 10, 13, 15, 17, 20, 22, 25, 27, 29, 32, 34, 37, 39};
static const uint8_t bytes_to_hex_digits[] ALIGN1 =
{0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32};
/* Convert enum size_spec to the size of the named type. */
static const signed char width_bytes[] ALIGN1 = {
-1,
sizeof(char),
sizeof(short),
sizeof(int),
sizeof(long),
sizeof(ulonglong_t),
sizeof(float),
sizeof(double),
sizeof(longdouble_t)
};
/* Ensure that for each member of 'enum size_spec' there is an
initializer in the width_bytes array. */
struct ERR_width_bytes_has_bad_size {
char ERR_width_bytes_has_bad_size[ARRAY_SIZE(width_bytes) == N_SIZE_SPECS ? 1 : -1];
};
struct globals {
smallint exit_code;
unsigned string_min;
/* An array of specs describing how to format each input block. */
unsigned n_specs;
struct tspec *spec;
/* Function that accepts an address and an optional following char,
and prints the address and char to stdout. */
void (*format_address)(off_t, char);
/* The difference between the old-style pseudo starting address and
the number of bytes to skip. */
#if ENABLE_LONG_OPTS
off_t pseudo_offset;
# define G_pseudo_offset G.pseudo_offset
#endif
/* When zero, MAX_BYTES_TO_FORMAT and END_OFFSET are ignored, and all
input is formatted. */
/* The number of input bytes formatted per output line. It must be
a multiple of the least common multiple of the sizes associated with
the specified output types. It should be as large as possible, but
no larger than 16 -- unless specified with the -w option. */
unsigned bytes_per_block; /* have to use unsigned, not size_t */
/* A NULL-terminated list of the file-arguments from the command line. */
const char *const *file_list;
/* The input stream associated with the current file. */
FILE *in_stream;
bool not_first;
bool prev_pair_equal;
char address_fmt[sizeof("%0n"OFF_FMT"xc")];
} FIX_ALIASING;
/* Corresponds to 'x' above */
#define address_base_char G.address_fmt[sizeof(G.address_fmt)-3]
/* Corresponds to 'n' above */
#define address_pad_len_char G.address_fmt[2]
#if !ENABLE_LONG_OPTS
enum { G_pseudo_offset = 0 };
#endif
#define G (*(struct globals*)bb_common_bufsiz1)
#define INIT_G() do { \
setup_common_bufsiz(); \
BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
G.bytes_per_block = 32; \
strcpy(G.address_fmt, "%0n"OFF_FMT"xc"); \
} while (0)
#define MAX_INTEGRAL_TYPE_SIZE sizeof(ulonglong_t)
static const unsigned char integral_type_size[MAX_INTEGRAL_TYPE_SIZE + 1] ALIGN1 = {
[sizeof(char)] = CHAR,
#if USHRT_MAX != UCHAR_MAX
[sizeof(short)] = SHORT,
#endif
#if UINT_MAX != USHRT_MAX
[sizeof(int)] = INT,
#endif
#if ULONG_MAX != UINT_MAX
[sizeof(long)] = LONG,
#endif
#if ULLONG_MAX != ULONG_MAX
[sizeof(ulonglong_t)] = LONG_LONG,
#endif
};
#define MAX_FP_TYPE_SIZE sizeof(longdouble_t)
static const unsigned char fp_type_size[MAX_FP_TYPE_SIZE + 1] ALIGN1 = {
/* gcc seems to allow repeated indexes. Last one wins */
[sizeof(longdouble_t)] = FLOAT_LONG_DOUBLE,
[sizeof(double)] = FLOAT_DOUBLE,
[sizeof(float)] = FLOAT_SINGLE
};
static unsigned
gcd(unsigned u, unsigned v)
{
unsigned t;
while (v != 0) {
t = u % v;
u = v;
v = t;
}
return u;
}
/* Compute the least common multiple of U and V. */
static unsigned
lcm(unsigned u, unsigned v) {
unsigned t = gcd(u, v);
if (t == 0)
return 0;
return u * v / t;
}
static void
print_s_char(size_t n_bytes, const char *block, const char *fmt_string)
{
while (n_bytes--) {
int tmp = *(signed char *) block;
printf(fmt_string, tmp);
block += sizeof(unsigned char);
}
}
static void
print_char(size_t n_bytes, const char *block, const char *fmt_string)
{
while (n_bytes--) {
unsigned tmp = *(unsigned char *) block;
printf(fmt_string, tmp);
block += sizeof(unsigned char);
}
}
static void
print_s_short(size_t n_bytes, const char *block, const char *fmt_string)
{
n_bytes /= sizeof(signed short);
while (n_bytes--) {
int tmp = *(signed short *) block;
printf(fmt_string, tmp);
block += sizeof(unsigned short);
}
}
static void
print_short(size_t n_bytes, const char *block, const char *fmt_string)
{
n_bytes /= sizeof(unsigned short);
while (n_bytes--) {
unsigned tmp = *(unsigned short *) block;
printf(fmt_string, tmp);
block += sizeof(unsigned short);
}
}
static void
print_int(size_t n_bytes, const char *block, const char *fmt_string)
{
n_bytes /= sizeof(unsigned);
while (n_bytes--) {
unsigned tmp = *(unsigned *) block;
printf(fmt_string, tmp);
block += sizeof(unsigned);
}
}
#if UINT_MAX == ULONG_MAX
# define print_long print_int
#else
static void
print_long(size_t n_bytes, const char *block, const char *fmt_string)
{
n_bytes /= sizeof(unsigned long);
while (n_bytes--) {
unsigned long tmp = *(unsigned long *) block;
printf(fmt_string, tmp);
block += sizeof(unsigned long);
}
}
#endif
#if ULONG_MAX == ULLONG_MAX
# define print_long_long print_long
#else
static void
print_long_long(size_t n_bytes, const char *block, const char *fmt_string)
{
n_bytes /= sizeof(ulonglong_t);
while (n_bytes--) {
ulonglong_t tmp = *(ulonglong_t *) block;
printf(fmt_string, tmp);
block += sizeof(ulonglong_t);
}
}
#endif
static void
print_float(size_t n_bytes, const char *block, const char *fmt_string)
{
n_bytes /= sizeof(float);
while (n_bytes--) {
float tmp = *(float *) block;
printf(fmt_string, tmp);
block += sizeof(float);
}
}
static void
print_double(size_t n_bytes, const char *block, const char *fmt_string)
{
n_bytes /= sizeof(double);
while (n_bytes--) {
double tmp = *(double *) block;
printf(fmt_string, tmp);
block += sizeof(double);
}
}
static void
print_long_double(size_t n_bytes, const char *block, const char *fmt_string)
{
n_bytes /= sizeof(longdouble_t);
while (n_bytes--) {
longdouble_t tmp = *(longdouble_t *) block;
printf(fmt_string, tmp);
block += sizeof(longdouble_t);
}
}
/* print_[named]_ascii are optimized for speed.
2008-02-11 17:14:38 +05:30
* Remember, someday you may want to pump gigabytes through this thing.
* Saving a dozen of .text bytes here is counter-productive */
static void
print_named_ascii(size_t n_bytes, const char *block,
2008-07-05 14:48:54 +05:30
const char *unused_fmt_string UNUSED_PARAM)
{
/* Names for some non-printing characters. */
static const char charname[33][3] ALIGN1 = {
"nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel",
" bs", " ht", " nl", " vt", " ff", " cr", " so", " si",
"dle", "dc1", "dc2", "dc3", "dc4", "nak", "syn", "etb",
"can", " em", "sub", "esc", " fs", " gs", " rs", " us",
" sp"
};
// buf[N] pos: 01234 56789
char buf[12] = " x\0 xxx\0";
// [12] because we take three 32bit stack slots anyway, and
// gcc is too dumb to initialize with constant stores,
// it copies initializer from rodata. Oh well.
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65410
while (n_bytes--) {
unsigned masked_c = *(unsigned char *) block++;
masked_c &= 0x7f;
if (masked_c == 0x7f) {
fputs(" del", stdout);
continue;
}
if (masked_c > ' ') {
buf[3] = masked_c;
fputs(buf, stdout);
continue;
}
/* Why? Because printf(" %3.3s") is much slower... */
buf[6] = charname[masked_c][0];
buf[7] = charname[masked_c][1];
buf[8] = charname[masked_c][2];
fputs(buf+5, stdout);
}
}
static void
print_ascii(size_t n_bytes, const char *block,
2008-07-05 14:48:54 +05:30
const char *unused_fmt_string UNUSED_PARAM)
{
// buf[N] pos: 01234 56789
char buf[12] = " x\0 xxx\0";
while (n_bytes--) {
const char *s;
unsigned c = *(unsigned char *) block++;
if (ISPRINT(c)) {
buf[3] = c;
fputs(buf, stdout);
continue;
}
switch (c) {
case '\0':
s = " \\0";
break;
case '\007':
s = " \\a";
break;
case '\b':
s = " \\b";
break;
case '\f':
s = " \\f";
break;
case '\n':
s = " \\n";
break;
case '\r':
s = " \\r";
break;
case '\t':
s = " \\t";
break;
case '\v':
s = " \\v";
break;
default:
buf[6] = (c >> 6 & 3) + '0';
buf[7] = (c >> 3 & 7) + '0';
buf[8] = (c & 7) + '0';
s = buf + 5;
}
fputs(s, stdout);
}
}
/* Given a list of one or more input filenames FILE_LIST, set the global
file pointer IN_STREAM and the global string INPUT_FILENAME to the
first one that can be successfully opened. Modify FILE_LIST to
reference the next filename in the list. A file name of "-" is
interpreted as standard input. If any file open fails, give an error
message and return nonzero. */
static void
open_next_file(void)
{
while (1) {
if (!*G.file_list)
return;
G.in_stream = fopen_or_warn_stdin(*G.file_list++);
if (G.in_stream) {
break;
}
G.exit_code = 1;
}
if ((option_mask32 & (OPT_N|OPT_S)) == OPT_N)
setbuf(G.in_stream, NULL);
}
/* Test whether there have been errors on in_stream, and close it if
it is not standard input. Return nonzero if there has been an error
on in_stream or stdout; return zero otherwise. This function will
report more than one error only if both a read and a write error
have occurred. IN_ERRNO, if nonzero, is the error number
corresponding to the most recent action for IN_STREAM. */
static void
check_and_close(void)
{
if (G.in_stream) {
if (ferror(G.in_stream)) {
bb_error_msg("%s: read error", (G.in_stream == stdin)
? bb_msg_standard_input
: G.file_list[-1]
);
G.exit_code = 1;
}
fclose_if_not_stdin(G.in_stream);
G.in_stream = NULL;
}
if (ferror(stdout)) {
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(bb_msg_write_error);
}
}
/* If S points to a single valid modern od format string, put
2008-04-15 01:20:06 +05:30
a description of that format in *TSPEC, return pointer to
character following the just-decoded format.
For example, if S were "d4afL", we will return a rtp to "afL"
and *TSPEC would be
{
fmt = SIGNED_DECIMAL;
size = INT or LONG; (whichever integral_type_size[4] resolves to)
print_function = print_int; (assuming size == INT)
2007-03-07 15:05:43 +05:30
fmt_string = "%011d%c";
}
S_ORIG is solely for reporting errors. It should be the full format
string argument. */
static NOINLINE const char *
2008-04-15 01:20:06 +05:30
decode_one_format(const char *s_orig, const char *s, struct tspec *tspec)
{
enum size_spec size_spec;
unsigned size;
enum output_format fmt;
const char *p;
char *end;
char *fmt_string = NULL;
void (*print_function) (size_t, const char *, const char *);
unsigned c;
unsigned field_width = 0;
int pos;
switch (*s) {
case 'd':
case 'o':
case 'u':
case 'x': {
static const char CSIL[] ALIGN1 = "CSIL";
c = *s++;
p = strchr(CSIL, *s);
/* if *s == NUL, p != NULL! Testcase: "od -tx" */
if (!p || *p == '\0') {
size = sizeof(int);
if (isdigit(s[0])) {
size = bb_strtou(s, &end, 0);
if (errno == ERANGE
|| MAX_INTEGRAL_TYPE_SIZE < size
|| integral_type_size[size] == NO_SIZE
) {
bb_error_msg_and_die("invalid type string '%s'; "
"%u-byte %s type is not supported",
s_orig, size, "integral");
}
s = end;
}
} else {
2008-04-15 01:20:06 +05:30
static const uint8_t CSIL_sizeof[4] = {
sizeof(char),
sizeof(short),
sizeof(int),
sizeof(long),
};
size = CSIL_sizeof[p - CSIL];
2008-04-15 01:20:06 +05:30
s++; /* skip C/S/I/L */
}
#define ISPEC_TO_FORMAT(Spec, Min_format, Long_format, Max_format) \
((Spec) == LONG_LONG ? (Max_format) \
: ((Spec) == LONG ? (Long_format) : (Min_format)))
#define FMT_BYTES_ALLOCATED 9
size_spec = integral_type_size[size];
{
static const char doux[] ALIGN1 = "doux";
static const char doux_fmt_letter[][4] = {
"lld", "llo", "llu", "llx"
};
static const enum output_format doux_fmt[] = {
SIGNED_DECIMAL,
OCTAL,
UNSIGNED_DECIMAL,
HEXADECIMAL,
};
static const uint8_t *const doux_bytes_to_XXX[] = {
bytes_to_signed_dec_digits,
bytes_to_oct_digits,
bytes_to_unsigned_dec_digits,
bytes_to_hex_digits,
};
static const char doux_fmtstring[][sizeof(" %%0%u%s")] = {
" %%%u%s",
" %%0%u%s",
" %%%u%s",
" %%0%u%s",
};
pos = strchr(doux, c) - doux;
fmt = doux_fmt[pos];
field_width = doux_bytes_to_XXX[pos][size];
p = doux_fmt_letter[pos] + 2;
if (size_spec == LONG) p--;
if (size_spec == LONG_LONG) p -= 2;
fmt_string = xasprintf(doux_fmtstring[pos], field_width, p);
}
switch (size_spec) {
case CHAR:
print_function = (fmt == SIGNED_DECIMAL
? print_s_char
: print_char);
break;
case SHORT:
print_function = (fmt == SIGNED_DECIMAL
? print_s_short
: print_short);
break;
case INT:
print_function = print_int;
break;
case LONG:
print_function = print_long;
break;
default: /* case LONG_LONG: */
print_function = print_long_long;
break;
}
break;
}
case 'f': {
static const char FDL[] ALIGN1 = "FDL";
fmt = FLOATING_POINT;
++s;
p = strchr(FDL, *s);
if (!p || *p == '\0') {
size = sizeof(double);
if (isdigit(s[0])) {
size = bb_strtou(s, &end, 0);
if (errno == ERANGE || size > MAX_FP_TYPE_SIZE
|| fp_type_size[size] == NO_SIZE
) {
bb_error_msg_and_die("invalid type string '%s'; "
"%u-byte %s type is not supported",
s_orig, size, "floating point");
}
s = end;
}
} else {
static const uint8_t FDL_sizeof[] = {
sizeof(float),
sizeof(double),
sizeof(longdouble_t),
};
size = FDL_sizeof[p - FDL];
s++; /* skip F/D/L */
}
size_spec = fp_type_size[size];
switch (size_spec) {
case FLOAT_SINGLE:
print_function = print_float;
field_width = FLT_DIG + 8;
/* Don't use %#e; not all systems support it. */
fmt_string = xasprintf(" %%%d.%de", field_width, FLT_DIG);
break;
case FLOAT_DOUBLE:
print_function = print_double;
field_width = DBL_DIG + 8;
fmt_string = xasprintf(" %%%d.%de", field_width, DBL_DIG);
break;
default: /* case FLOAT_LONG_DOUBLE: */
print_function = print_long_double;
field_width = LDBL_DIG + 8;
fmt_string = xasprintf(" %%%d.%dLe", field_width, LDBL_DIG);
break;
}
break;
}
case 'a':
++s;
fmt = NAMED_CHARACTER;
size_spec = CHAR;
print_function = print_named_ascii;
field_width = 3;
break;
case 'c':
++s;
fmt = CHARACTER;
size_spec = CHAR;
print_function = print_ascii;
field_width = 3;
break;
default:
bb_error_msg_and_die("invalid character '%c' "
"in type string '%s'", *s, s_orig);
}
tspec->size = size_spec;
tspec->fmt = fmt;
tspec->print_function = print_function;
tspec->fmt_string = fmt_string;
tspec->field_width = field_width;
tspec->hexl_mode_trailer = (*s == 'z');
if (tspec->hexl_mode_trailer)
s++;
2008-04-15 01:20:06 +05:30
return s;
}
/* Decode the modern od format string S. Append the decoded
representation to the global array SPEC, reallocating SPEC if
necessary. */
static void
decode_format_string(const char *s)
{
const char *s_orig = s;
while (*s != '\0') {
struct tspec tspec;
const char *next;
2008-04-15 01:20:06 +05:30
next = decode_one_format(s_orig, s, &tspec);
assert(s != next);
s = next;
G.spec = xrealloc_vector(G.spec, 4, G.n_specs);
memcpy(&G.spec[G.n_specs], &tspec, sizeof(G.spec[0]));
G.n_specs++;
}
}
/* Given a list of one or more input filenames FILE_LIST, set the global
file pointer IN_STREAM to position N_SKIP in the concatenation of
those files. If any file operation fails or if there are fewer than
N_SKIP bytes in the combined input, give an error message and return
nonzero. When possible, use seek rather than read operations to
advance IN_STREAM. */
static void
skip(off_t n_skip)
{
if (n_skip == 0)
return;
while (G.in_stream) { /* !EOF */
struct stat file_stats;
/* First try seeking. For large offsets, this extra work is
worthwhile. If the offset is below some threshold it may be
more efficient to move the pointer by reading. There are two
issues when trying to seek:
- the file must be seekable.
- before seeking to the specified position, make sure
that the new position is in the current file.
Try to do that by getting file's size using fstat.
But that will work only for regular files. */
/* The st_size field is valid only for regular files
(and for symbolic links, which cannot occur here).
If the number of bytes left to skip is at least
as large as the size of the current file, we can
decrement n_skip and go on to the next file. */
if (fstat(fileno(G.in_stream), &file_stats) == 0
&& S_ISREG(file_stats.st_mode) && file_stats.st_size > 0
) {
if (file_stats.st_size < n_skip) {
n_skip -= file_stats.st_size;
/* take "check & close / open_next" route */
} else {
if (fseeko(G.in_stream, n_skip, SEEK_CUR) != 0)
G.exit_code = 1;
return;
}
} else {
/* If it's not a regular file with positive size,
position the file pointer by reading. */
char buf[1024];
size_t n_bytes_to_read = 1024;
size_t n_bytes_read;
while (n_skip > 0) {
if (n_skip < n_bytes_to_read)
n_bytes_to_read = n_skip;
n_bytes_read = fread(buf, 1, n_bytes_to_read, G.in_stream);
n_skip -= n_bytes_read;
if (n_bytes_read != n_bytes_to_read)
2007-03-07 15:05:43 +05:30
break; /* EOF on this file or error */
}
}
if (n_skip == 0)
return;
check_and_close();
open_next_file();
}
if (n_skip)
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("can't skip past end of combined input");
}
typedef void FN_format_address(off_t address, char c);
static void
2008-07-05 14:48:54 +05:30
format_address_none(off_t address UNUSED_PARAM, char c UNUSED_PARAM)
{
}
static void
format_address_std(off_t address, char c)
{
/* Corresponds to 'c' */
G.address_fmt[sizeof(G.address_fmt)-2] = c;
printf(G.address_fmt, address);
}
#if ENABLE_LONG_OPTS
/* only used with --traditional */
static void
format_address_paren(off_t address, char c)
{
putchar('(');
format_address_std(address, ')');
if (c) putchar(c);
}
static void
format_address_label(off_t address, char c)
{
format_address_std(address, ' ');
format_address_paren(address + G_pseudo_offset, c);
}
#endif
static void
dump_hexl_mode_trailer(size_t n_bytes, const char *block)
{
fputs(" >", stdout);
while (n_bytes--) {
unsigned c = *(unsigned char *) block++;
c = (ISPRINT(c) ? c : '.');
putchar(c);
}
putchar('<');
}
/* Write N_BYTES bytes from CURR_BLOCK to standard output once for each
of the N_SPEC format specs. CURRENT_OFFSET is the byte address of
CURR_BLOCK in the concatenation of input files, and it is printed
(optionally) only before the output line associated with the first
format spec. When duplicate blocks are being abbreviated, the output
for a sequence of identical input blocks is the output for the first
block followed by an asterisk alone on a line. It is valid to compare
the blocks PREV_BLOCK and CURR_BLOCK only when N_BYTES == BYTES_PER_BLOCK.
That condition may be false only for the last input block -- and then
only when it has not been padded to length BYTES_PER_BLOCK. */
static void
write_block(off_t current_offset, size_t n_bytes,
const char *prev_block, const char *curr_block)
{
unsigned i;
if (!(option_mask32 & OPT_v)
&& G.not_first
&& n_bytes == G.bytes_per_block
&& memcmp(prev_block, curr_block, G.bytes_per_block) == 0
) {
if (G.prev_pair_equal) {
/* The two preceding blocks were equal, and the current
block is the same as the last one, so print nothing. */
} else {
puts("*");
G.prev_pair_equal = 1;
}
} else {
G.not_first = 1;
G.prev_pair_equal = 0;
for (i = 0; i < G.n_specs; i++) {
if (i == 0)
G.format_address(current_offset, '\0');
else
printf("%*s", address_pad_len_char - '0', "");
(*G.spec[i].print_function) (n_bytes, curr_block, G.spec[i].fmt_string);
if (G.spec[i].hexl_mode_trailer) {
/* space-pad out to full line width, then dump the trailer */
unsigned datum_width = width_bytes[G.spec[i].size];
unsigned blank_fields = (G.bytes_per_block - n_bytes) / datum_width;
unsigned field_width = G.spec[i].field_width + 1;
printf("%*s", blank_fields * field_width, "");
dump_hexl_mode_trailer(n_bytes, curr_block);
}
putchar('\n');
}
}
}
static void
read_block(size_t n, char *block, size_t *n_bytes_in_buffer)
{
assert(0 < n && n <= G.bytes_per_block);
*n_bytes_in_buffer = 0;
if (n == 0)
return;
while (G.in_stream != NULL) { /* EOF. */
size_t n_needed;
size_t n_read;
n_needed = n - *n_bytes_in_buffer;
n_read = fread(block + *n_bytes_in_buffer, 1, n_needed, G.in_stream);
*n_bytes_in_buffer += n_read;
if (n_read == n_needed)
break;
/* error check is done in check_and_close */
check_and_close();
open_next_file();
}
}
/* Return the least common multiple of the sizes associated
with the format specs. */
static int
get_lcm(void)
{
size_t i;
int l_c_m = 1;
for (i = 0; i < G.n_specs; i++)
l_c_m = lcm(l_c_m, width_bytes[(int) G.spec[i].size]);
return l_c_m;
}
/* Read a chunk of size BYTES_PER_BLOCK from the input files, write the
formatted block to standard output, and repeat until the specified
maximum number of bytes has been read or until all input has been
processed. If the last block read is smaller than BYTES_PER_BLOCK
and its size is not a multiple of the size associated with a format
spec, extend the input block with zero bytes until its length is a
multiple of all format spec sizes. Write the final block. Finally,
write on a line by itself the offset of the byte after the last byte
read. */
static void
dump(off_t current_offset, off_t end_offset)
{
char *block[2];
int idx;
size_t n_bytes_read;
block[0] = xmalloc(2 * G.bytes_per_block);
block[1] = block[0] + G.bytes_per_block;
idx = 0;
if (option_mask32 & OPT_N) {
while (1) {
size_t n_needed;
if (current_offset >= end_offset) {
n_bytes_read = 0;
break;
}
n_needed = MIN(end_offset - current_offset, (off_t) G.bytes_per_block);
read_block(n_needed, block[idx], &n_bytes_read);
if (n_bytes_read < G.bytes_per_block)
break;
assert(n_bytes_read == G.bytes_per_block);
write_block(current_offset, n_bytes_read, block[idx ^ 1], block[idx]);
current_offset += n_bytes_read;
idx ^= 1;
}
} else {
while (1) {
read_block(G.bytes_per_block, block[idx], &n_bytes_read);
if (n_bytes_read < G.bytes_per_block)
break;
assert(n_bytes_read == G.bytes_per_block);
write_block(current_offset, n_bytes_read, block[idx ^ 1], block[idx]);
current_offset += n_bytes_read;
idx ^= 1;
}
}
if (n_bytes_read > 0) {
int l_c_m;
size_t bytes_to_write;
l_c_m = get_lcm();
/* Make bytes_to_write the smallest multiple of l_c_m that
is at least as large as n_bytes_read. */
bytes_to_write = l_c_m * ((n_bytes_read + l_c_m - 1) / l_c_m);
memset(block[idx] + n_bytes_read, 0, bytes_to_write - n_bytes_read);
write_block(current_offset, bytes_to_write,
block[idx ^ 1], block[idx]);
current_offset += n_bytes_read;
}
G.format_address(current_offset, '\n');
if ((option_mask32 & OPT_N) && current_offset >= end_offset)
check_and_close();
free(block[0]);
}
/* Read N bytes into BLOCK from the concatenation of the input files
named in the global array FILE_LIST. On the first call to this
function, the global variable IN_STREAM is expected to be an open
stream associated with the input file INPUT_FILENAME. If all N
bytes cannot be read from IN_STREAM, close IN_STREAM and update
the global variables IN_STREAM and INPUT_FILENAME. Then try to
read the remaining bytes from the newly opened file. Repeat if
necessary until EOF is reached for the last file in FILE_LIST.
On subsequent calls, don't modify BLOCK and return zero. Set
*N_BYTES_IN_BUFFER to the number of bytes read. If an error occurs,
it will be detected through ferror when the stream is about to be
closed. If there is an error, give a message but continue reading
as usual and return nonzero. Otherwise return zero. */
/* STRINGS mode. Find each "string constant" in the input.
A string constant is a run of at least 'string_min' ASCII
graphic (or formatting) characters terminated by a null.
Based on a function written by Richard Stallman for a
traditional version of od. */
static void
dump_strings(off_t address, off_t end_offset)
{
unsigned bufsize = MAX(100, G.string_min);
unsigned char *buf = xmalloc(bufsize);
while (1) {
size_t i;
int c;
/* See if the next 'G.string_min' chars are all printing chars. */
tryline:
if ((option_mask32 & OPT_N) && (end_offset - G.string_min <= address))
break;
i = 0;
while (!(option_mask32 & OPT_N) || address < end_offset) {
if (i == bufsize) {
bufsize += bufsize/8;
buf = xrealloc(buf, bufsize);
}
while (G.in_stream) { /* !EOF */
c = fgetc(G.in_stream);
if (c != EOF)
goto got_char;
check_and_close();
open_next_file();
}
/* EOF */
goto ret;
got_char:
address++;
if (!c)
break;
if (!ISPRINT(c))
goto tryline; /* It isn't; give up on this string. */
buf[i++] = c; /* String continues; store it all. */
}
if (i < G.string_min) /* Too short! */
goto tryline;
/* If we get here, the string is all printable and NUL-terminated */
buf[i] = 0;
G.format_address(address - i - 1, ' ');
for (i = 0; (c = buf[i]); i++) {
switch (c) {
case '\007': fputs("\\a", stdout); break;
case '\b': fputs("\\b", stdout); break;
case '\f': fputs("\\f", stdout); break;
case '\n': fputs("\\n", stdout); break;
case '\r': fputs("\\r", stdout); break;
case '\t': fputs("\\t", stdout); break;
case '\v': fputs("\\v", stdout); break;
default: putchar(c);
}
}
putchar('\n');
}
/* We reach this point only if we search through
(max_bytes_to_format - G.string_min) bytes before reaching EOF. */
check_and_close();
ret:
free(buf);
}
#if ENABLE_LONG_OPTS
/* If S is a valid traditional offset specification with an optional
leading '+' return nonzero and set *OFFSET to the offset it denotes. */
static int
parse_old_offset(const char *s, off_t *offset)
{
static const struct suffix_mult Bb[] = {
{ "B", 1024 },
{ "b", 512 },
{ "", 0 }
};
char *p;
int radix;
/* Skip over any leading '+'. */
if (s[0] == '+') ++s;
if (!isdigit(s[0])) return 0; /* not a number */
/* Determine the radix we'll use to interpret S. If there is a '.',
* it's decimal, otherwise, if the string begins with '0X'or '0x',
* it's hexadecimal, else octal. */
p = strchr(s, '.');
radix = 8;
if (p) {
p[0] = '\0'; /* cheating */
radix = 10;
} else if (s[0] == '0' && (s[1] == 'x' || s[1] == 'X'))
radix = 16;
*offset = xstrtooff_sfx(s, radix, Bb);
if (p) p[0] = '.';
return (*offset >= 0);
}
#endif
int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int od_main(int argc UNUSED_PARAM, char **argv)
{
#if ENABLE_LONG_OPTS
static const char od_longopts[] ALIGN1 =
2007-07-23 22:44:14 +05:30
"skip-bytes\0" Required_argument "j"
"address-radix\0" Required_argument "A"
"read-bytes\0" Required_argument "N"
"format\0" Required_argument "t"
"output-duplicates\0" No_argument "v"
/* Yes, it's true: -S NUM, but --strings[=NUM]!
* that is, NUM is mandatory for -S but optional for --strings!
*/
2007-07-23 22:44:14 +05:30
"strings\0" Optional_argument "S"
"width\0" Optional_argument "w"
"traditional\0" No_argument "\xff"
;
#endif
const char *str_A, *str_N, *str_j, *str_S = "3";
llist_t *lst_t = NULL;
unsigned opt;
int l_c_m;
/* The number of input bytes to skip before formatting and writing. */
off_t n_bytes_to_skip = 0;
/* The offset of the first byte after the last byte to be formatted. */
off_t end_offset = 0;
/* The maximum number of bytes that will be formatted. */
off_t max_bytes_to_format = 0;
INIT_G();
/*G.spec = NULL; - already is */
G.format_address = format_address_std;
address_base_char = 'o';
address_pad_len_char = '7';
/* Parse command line */
opt = OD_GETOPT32();
argv += optind;
if (opt & OPT_A) {
static const char doxn[] ALIGN1 = "doxn";
static const char doxn_address_base_char[] ALIGN1 = {
'u', 'o', 'x', /* '?' fourth one is not important */
};
static const uint8_t doxn_address_pad_len_char[] ALIGN1 = {
'7', '7', '6', /* '?' */
};
char *p;
int pos;
p = strchr(doxn, str_A[0]);
if (!p)
bb_error_msg_and_die("bad output address radix "
"'%c' (must be [doxn])", str_A[0]);
pos = p - doxn;
if (pos == 3) G.format_address = format_address_none;
address_base_char = doxn_address_base_char[pos];
address_pad_len_char = doxn_address_pad_len_char[pos];
}
if (opt & OPT_N) {
max_bytes_to_format = xstrtooff_sfx(str_N, 0, bkm_suffixes);
}
if (opt & OPT_a) decode_format_string("a");
if (opt & OPT_b) decode_format_string("oC");
if (opt & OPT_c) decode_format_string("c");
if (opt & OPT_d) decode_format_string("u2");
if (opt & OPT_f) decode_format_string("fF");
if (opt & OPT_h) decode_format_string("x2");
if (opt & OPT_i) decode_format_string("d2");
if (opt & OPT_j) n_bytes_to_skip = xstrtooff_sfx(str_j, 0, bkm_suffixes);
if (opt & OPT_l) decode_format_string("d4");
if (opt & OPT_o) decode_format_string("o2");
while (lst_t) {
decode_format_string(llist_pop(&lst_t));
}
if (opt & OPT_x) decode_format_string("x2");
if (opt & OPT_s) decode_format_string("d2");
if (opt & OPT_S) {
G.string_min = xstrtou_sfx(str_S, 0, bkm_suffixes);
}
// Bloat:
//if ((option_mask32 & OPT_S) && G.n_specs > 0)
// bb_error_msg_and_die("no type may be specified when dumping strings");
/* If the --traditional option is used, there may be from
* 0 to 3 remaining command line arguments; handle each case
* separately.
* od [FILE] [[+]OFFSET[.][b] [[+]LABEL[.][b]]]
* The offset and pseudo_start have the same syntax.
*
* FIXME: POSIX 1003.1-2001 with XSI requires support for the
* traditional syntax even if --traditional is not given. */
#if ENABLE_LONG_OPTS
if (opt & OPT_traditional) {
if (argv[0]) {
off_t pseudo_start = -1;
off_t o1, o2;
if (!argv[1]) { /* one arg */
if (parse_old_offset(argv[0], &o1)) {
/* od --traditional OFFSET */
n_bytes_to_skip = o1;
argv++;
}
/* od --traditional FILE */
} else if (!argv[2]) { /* two args */
if (parse_old_offset(argv[0], &o1)
&& parse_old_offset(argv[1], &o2)
) {
/* od --traditional OFFSET LABEL */
n_bytes_to_skip = o1;
pseudo_start = o2;
argv += 2;
} else if (parse_old_offset(argv[1], &o2)) {
/* od --traditional FILE OFFSET */
n_bytes_to_skip = o2;
argv[1] = NULL;
} else {
bb_error_msg_and_die("invalid second argument '%s'", argv[1]);
}
} else if (!argv[3]) { /* three args */
if (parse_old_offset(argv[1], &o1)
&& parse_old_offset(argv[2], &o2)
) {
/* od --traditional FILE OFFSET LABEL */
n_bytes_to_skip = o1;
pseudo_start = o2;
argv[1] = NULL;
} else {
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("the last two arguments must be offsets");
}
} else { /* >3 args */
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("too many arguments");
}
if (pseudo_start >= 0) {
if (G.format_address == format_address_none) {
address_base_char = 'o';
address_pad_len_char = '7';
G.format_address = format_address_paren;
} else {
G.format_address = format_address_label;
}
G_pseudo_offset = pseudo_start - n_bytes_to_skip;
}
}
/* else: od --traditional (without args) */
}
#endif
if (option_mask32 & OPT_N) {
end_offset = n_bytes_to_skip + max_bytes_to_format;
if (end_offset < n_bytes_to_skip)
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("SKIP + SIZE is too large");
}
if (G.n_specs == 0) {
decode_format_string("o2");
/*G.n_specs = 1; - done by decode_format_string */
}
/* If no files were listed on the command line,
set the global pointer FILE_LIST so that it
references the null-terminated list of one name: "-". */
G.file_list = bb_argv_dash;
if (argv[0]) {
/* Set the global pointer FILE_LIST so that it
references the first file-argument on the command-line. */
G.file_list = (char const *const *) argv;
}
/* Open the first input file */
open_next_file();
/* Skip over any unwanted header bytes */
skip(n_bytes_to_skip);
if (!G.in_stream)
return EXIT_FAILURE;
/* Compute output block length */
l_c_m = get_lcm();
if (opt & OPT_w) { /* -w: width */
if (!G.bytes_per_block || G.bytes_per_block % l_c_m != 0) {
bb_error_msg("warning: invalid width %u; using %d instead",
(unsigned)G.bytes_per_block, l_c_m);
G.bytes_per_block = l_c_m;
}
} else {
G.bytes_per_block = l_c_m;
if (l_c_m < DEFAULT_BYTES_PER_BLOCK)
G.bytes_per_block *= DEFAULT_BYTES_PER_BLOCK / l_c_m;
}
#ifdef DEBUG
{
int i;
for (i = 0; i < G.n_specs; i++) {
printf("%d: fmt='%s' width=%d\n",
i, G.spec[i].fmt_string,
width_bytes[G.spec[i].size]);
}
}
#endif
if (option_mask32 & OPT_S)
dump_strings(n_bytes_to_skip, end_offset);
else
dump(n_bytes_to_skip, end_offset);
if (fclose(stdin))
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_and_die(bb_msg_standard_input);
return G.exit_code;
}