summaryrefslogtreecommitdiff
path: root/util-linux/hexdump.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-07-21 23:05:26 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-07-21 23:05:26 +0000
commit5415c856eaccd1bc5d064022770a288f43b2e94f (patch)
tree5973db4e6f81b5e311e8944700ded5db1083d440 /util-linux/hexdump.c
parentb74a2dba571d1c5a6127c683fb50923336d9c59f (diff)
downloadbusybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.gz
busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.bz2
busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.zip
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
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;