hush/util-linux/hexdump.c
Denis Vlasenko 5415c856ea libbb: [x]fopen_for_{read,write} introduced and used.
(by Valdimir)

function                                             old     new   delta
config_open2                                           -      41     +41
config_read                                          507     542     +35
find_pair                                            169     187     +18
fopen_for_write                                        -      14     +14
fopen_for_read                                         -      14     +14
find_main                                            406     418     +12
xfopen_for_write                                       -      10     +10
xfopen_for_read                                        -      10     +10
popstring                                            134     140      +6
parse_inittab                                        396     401      +5
next_token                                           923     928      +5
pack_gzip                                           1659    1661      +2
bb__parsespent                                       117     119      +2
fallbackSort                                        1719    1717      -2
evalvar                                             1376    1374      -2
qrealloc                                              36      33      -3
...
...
...
...
singlemount                                         4579    4569     -10
process_stdin                                        443     433     -10
patch_main                                          1111    1101     -10
ifupdown_main                                       2175    2165     -10
file_action_grep                                      90      80     -10
uuidcache_init                                       649     637     -12
hush_main                                            797     785     -12
read_config                                          230     217     -13
dpkg_main                                           3835    3820     -15
read_line_input                                     3134    3110     -24
sysctl_main                                          232     203     -29
config_open                                           40      10     -30
WARN_BAD_LINE                                         44       -     -44
login_main                                          1714    1575    -139
------------------------------------------------------------------------------
(add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737)        Total: -563 bytes
2008-07-21 23:05:26 +00:00

144 lines
3.4 KiB
C

/* vi: set sw=4 ts=4: */
/*
* hexdump implementation for busybox
* Based on code from util-linux v 2.11l
*
* Copyright (c) 1989
* The Regents of the University of California. All rights reserved.
*
* Licensed under GPLv2 or later, see file License in this tarball for details.
*/
#include "libbb.h"
#include "dump.h"
/* This is a NOEXEC applet. Be very careful! */
static void bb_dump_addfile(dumper_t *dumper, char *name)
{
parser_t *parser = config_open2(name, xfopen_for_read);
while (config_read(parser, &name, 1, 1, "# \t", 0)) {
bb_dump_add(dumper, name);
}
config_close(parser);
}
static const char *const add_strings[] = {
"\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"", /* b */
"\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"", /* c */
"\"%07.7_ax \" 8/2 \" %05u \" \"\\n\"", /* d */
"\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"", /* o */
"\"%07.7_ax \" 8/2 \" %04x \" \"\\n\"", /* x */
};
static const char add_first[] ALIGN1 = "\"%07.7_Ax\n\"";
static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v" USE_FEATURE_HEXDUMP_REVERSE("R");
static const struct suffix_mult suffixes[] = {
{ "b", 512 },
{ "k", 1024 },
{ "m", 1024*1024 },
{ }
};
int hexdump_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int hexdump_main(int argc, char **argv)
{
dumper_t *dumper = alloc_dumper();
const char *p;
int ch;
#if ENABLE_FEATURE_HEXDUMP_REVERSE
FILE *fp;
smallint rdump = 0;
#endif
if (ENABLE_HD && !applet_name[2]) { /* we are "hd" */
ch = 'C';
goto hd_applet;
}
/* We cannot use getopt32: in hexdump options are cumulative.
* E.g. "hexdump -C -C file" should dump each line twice */
while ((ch = getopt(argc, argv, hexdump_opts)) > 0) {
p = strchr(hexdump_opts, ch);
if (!p)
bb_show_usage();
if ((p - hexdump_opts) < 5) {
bb_dump_add(dumper, add_first);
bb_dump_add(dumper, add_strings[(int)(p - hexdump_opts)]);
}
/* Save a little bit of space below by omitting the 'else's. */
if (ch == 'C') {
hd_applet:
bb_dump_add(dumper, "\"%08.8_Ax\n\"");
bb_dump_add(dumper, "\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" ");
bb_dump_add(dumper, "\" |\" 16/1 \"%_p\" \"|\\n\"");
}
if (ch == 'e') {
bb_dump_add(dumper, optarg);
} /* else */
if (ch == 'f') {
bb_dump_addfile(dumper, optarg);
} /* else */
if (ch == 'n') {
dumper->dump_length = xatoi_u(optarg);
} /* else */
if (ch == 's') {
dumper->dump_skip = xatoul_range_sfx(optarg, 0, LONG_MAX, suffixes);
} /* else */
if (ch == 'v') {
dumper->dump_vflag = ALL;
}
#if ENABLE_FEATURE_HEXDUMP_REVERSE
if (ch == 'R') {
rdump = 1;
}
#endif
}
if (!dumper->fshead) {
bb_dump_add(dumper, add_first);
bb_dump_add(dumper, "\"%07.7_ax \" 8/2 \"%04x \" \"\\n\"");
}
argv += optind;
#if !ENABLE_FEATURE_HEXDUMP_REVERSE
return bb_dump_dump(dumper, argv);
#else
if (!rdump) {
return bb_dump_dump(dumper, argv);
}
/* -R: reverse of 'hexdump -Cv' */
fp = stdin;
if (!*argv) {
argv--;
goto jump_in;
}
do {
char *buf;
fp = xfopen_for_read(*argv);
jump_in:
while ((buf = xmalloc_fgetline(fp)) != NULL) {
p = buf;
while (1) {
/* skip address or previous byte */
while (isxdigit(*p)) p++;
while (*p == ' ') p++;
/* '|' char will break the line */
if (!isxdigit(*p) || sscanf(p, "%x ", &ch) != 1)
break;
putchar(ch);
}
free(buf);
}
fclose(fp);
} while (*++argv);
fflush_stdout_and_exit(EXIT_SUCCESS);
#endif
}