mirror of
https://github.com/sheumann/hush.git
synced 2024-12-28 07:30:23 +00:00
084266ed52
a bug where it underflows the string a bug where it never frees parser_t struct make read_config() return 0 if parser is NULL, make config_close() accept and ignore NULL parser - eliminates many if() blocks reverse the sense of parser bit flags - negative flags are harder to grok. hexdump: revert the change to use config parser, it is BIGGER and also requires additional quirks in parser *: explicitly use PARSER_NORMAL instead of 0 function old new delta login_main 1575 1596 +21 config_close 18 29 +11 bbunpack 383 391 +8 qgravechar 106 109 +3 rtnl_tab_initialize 121 117 -4 expand 1697 1693 -4 man_main 717 712 -5 nameif_main 674 668 -6 hexdump_main 597 591 -6 read_config 217 209 -8 dnsd_main 1478 1470 -8 sysctl_main 203 189 -14 config_open2 44 25 -19 make_device 1177 1141 -36 config_read 597 549 -48 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/11 up/down: 43/-158) Total: -115 bytes
152 lines
3.4 KiB
C
152 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)
|
|
{
|
|
char *p;
|
|
FILE *fp;
|
|
char *buf;
|
|
|
|
fp = xfopen_for_read(name);
|
|
while ((buf = xmalloc_fgetline(fp)) != NULL) {
|
|
p = skip_whitespace(buf);
|
|
if (*p && (*p != '#')) {
|
|
bb_dump_add(dumper, p);
|
|
}
|
|
free(buf);
|
|
}
|
|
fclose(fp);
|
|
}
|
|
|
|
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
|
|
}
|