summaryrefslogtreecommitdiff
path: root/util-linux/hexdump.c
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux/hexdump.c')
-rw-r--r--util-linux/hexdump.c38
1 files changed, 18 insertions, 20 deletions
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 7630153..4d2b059 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -15,7 +15,7 @@
/* This is a NOEXEC applet. Be very careful! */
-static void bb_dump_addfile(char *name)
+static void bb_dump_addfile(dumper_t *dumper, char *name)
{
char *p;
FILE *fp;
@@ -27,7 +27,7 @@ static void bb_dump_addfile(char *name)
p = skip_whitespace(buf);
if (*p && (*p != '#')) {
- bb_dump_add(p);
+ bb_dump_add(dumper, p);
}
free(buf);
}
@@ -56,6 +56,7 @@ static const struct suffix_mult suffixes[] = {
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
@@ -63,9 +64,6 @@ int hexdump_main(int argc, char **argv)
smallint rdump = 0;
#endif
- bb_dump_vflag = FIRST;
- bb_dump_length = -1;
-
if (ENABLE_HD && !applet_name[2]) { /* we are "hd" */
ch = 'C';
goto hd_applet;
@@ -78,30 +76,30 @@ int hexdump_main(int argc, char **argv)
if (!p)
bb_show_usage();
if ((p - hexdump_opts) < 5) {
- bb_dump_add(add_first);
- bb_dump_add(add_strings[(int)(p - hexdump_opts)]);
+ 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("\"%08.8_Ax\n\"");
- bb_dump_add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" ");
- bb_dump_add("\" |\" 16/1 \"%_p\" \"|\\n\"");
+ 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(optarg);
+ bb_dump_add(dumper, optarg);
} /* else */
if (ch == 'f') {
- bb_dump_addfile(optarg);
+ bb_dump_addfile(dumper, optarg);
} /* else */
if (ch == 'n') {
- bb_dump_length = xatoi_u(optarg);
+ dumper->dump_length = xatoi_u(optarg);
} /* else */
if (ch == 's') {
- bb_dump_skip = xatoul_range_sfx(optarg, 0, LONG_MAX, suffixes);
+ dumper->dump_skip = xatoul_range_sfx(optarg, 0, LONG_MAX, suffixes);
} /* else */
if (ch == 'v') {
- bb_dump_vflag = ALL;
+ dumper->dump_vflag = ALL;
}
#if ENABLE_FEATURE_HEXDUMP_REVERSE
if (ch == 'R') {
@@ -110,18 +108,18 @@ int hexdump_main(int argc, char **argv)
#endif
}
- if (!bb_dump_fshead) {
- bb_dump_add(add_first);
- bb_dump_add("\"%07.7_ax \" 8/2 \"%04x \" \"\\n\"");
+ 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(argv);
+ return bb_dump_dump(dumper, argv);
#else
if (!rdump) {
- return bb_dump_dump(argv);
+ return bb_dump_dump(dumper, argv);
}
/* -R: reverse of 'hexdump -Cv' */