aboutsummaryrefslogtreecommitdiff
path: root/util-linux/hexdump.c
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux/hexdump.c')
-rw-r--r--util-linux/hexdump.c21
1 files changed, 5 insertions, 16 deletions
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 4d2b0592b..8ac12f082 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -14,24 +14,13 @@
14 14
15/* This is a NOEXEC applet. Be very careful! */ 15/* This is a NOEXEC applet. Be very careful! */
16 16
17
18static void bb_dump_addfile(dumper_t *dumper, char *name) 17static void bb_dump_addfile(dumper_t *dumper, char *name)
19{ 18{
20 char *p; 19 parser_t *parser = config_open2(name, xfopen_for_read);
21 FILE *fp; 20 while (config_read(parser, &name, 1, 1, "# \t", 0)) {
22 char *buf; 21 bb_dump_add(dumper, name);
23
24 fp = xfopen(name, "r");
25
26 while ((buf = xmalloc_fgetline(fp)) != NULL) {
27 p = skip_whitespace(buf);
28
29 if (*p && (*p != '#')) {
30 bb_dump_add(dumper, p);
31 }
32 free(buf);
33 } 22 }
34 fclose(fp); 23 config_close(parser);
35} 24}
36 25
37static const char *const add_strings[] = { 26static const char *const add_strings[] = {
@@ -131,7 +120,7 @@ int hexdump_main(int argc, char **argv)
131 120
132 do { 121 do {
133 char *buf; 122 char *buf;
134 fp = xfopen(*argv, "r"); 123 fp = xfopen_for_read(*argv);
135 jump_in: 124 jump_in:
136 while ((buf = xmalloc_fgetline(fp)) != NULL) { 125 while ((buf = xmalloc_fgetline(fp)) != NULL) {
137 p = buf; 126 p = buf;