busybox/util-linux/hexdump.c
Denis Vlasenko 55f7912dda libbb: get rid of statics in dump.c; code shrinks a lot too
function                                             old     new   delta
alloc_dumper                                           -      26     +26
hexdump_main                                         600     601      +1
static.done                                            1       -      -1
static.ateof                                           1       -      -1
bb_dump_vflag                                          1       -      -1
static.savp                                            4       -      -4
static.nextfs                                          4       -      -4
static.curp                                            4       -      -4
exitval                                                4       -      -4
endfu                                                  4       -      -4
bb_dump_length                                         4       -      -4
bb_dump_fshead                                         4       -      -4
bb_dump_blocksize                                      4       -      -4
_argv                                                  4       -      -4
bb_dump_add                                          365     358      -7
savaddress                                             8       -      -8
eaddress                                               8       -      -8
bb_dump_skip                                           8       -      -8
address                                                8       -      -8
bb_dump_dump                                        2748    2672     -76
next                                                 538     445     -93
------------------------------------------------------------------------------
(add/remove: 1/16 grow/shrink: 1/3 up/down: 27/-247)         Total: -220 bytes
   text	   data	    bss	    dec	    hex	filename
 789458	    607	   6764	 796829	  c289d	busybox_old
 789309	    601	   6696	 796606	  c27be	busybox_unstripped
2008-07-16 11:00:16 +00:00

155 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(name, "r");
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(*argv, "r");
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
}