diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
commit | 5415c856eaccd1bc5d064022770a288f43b2e94f (patch) | |
tree | 5973db4e6f81b5e311e8944700ded5db1083d440 /editors | |
parent | b74a2dba571d1c5a6127c683fb50923336d9c59f (diff) | |
download | busybox-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 'editors')
-rw-r--r-- | editors/awk.c | 2 | ||||
-rw-r--r-- | editors/patch.c | 4 | ||||
-rw-r--r-- | editors/sed.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/editors/awk.c b/editors/awk.c index 7af9e1eeb..571d68193 100644 --- a/editors/awk.c +++ b/editors/awk.c | |||
@@ -2400,7 +2400,7 @@ static var *evaluate(node *op, var *res) | |||
2400 | X.rsm->F = popen(L.s, "r"); | 2400 | X.rsm->F = popen(L.s, "r"); |
2401 | X.rsm->is_pipe = TRUE; | 2401 | X.rsm->is_pipe = TRUE; |
2402 | } else { | 2402 | } else { |
2403 | X.rsm->F = fopen(L.s, "r"); /* not xfopen! */ | 2403 | X.rsm->F = fopen_for_read(L.s); /* not xfopen! */ |
2404 | } | 2404 | } |
2405 | } | 2405 | } |
2406 | } else { | 2406 | } else { |
diff --git a/editors/patch.c b/editors/patch.c index d5f6df275..e8482a7a9 100644 --- a/editors/patch.c +++ b/editors/patch.c | |||
@@ -131,9 +131,9 @@ int patch_main(int argc UNUSED_PARAM, char **argv) | |||
131 | } else { | 131 | } else { |
132 | backup_filename = xasprintf("%s.orig", new_filename); | 132 | backup_filename = xasprintf("%s.orig", new_filename); |
133 | xrename(new_filename, backup_filename); | 133 | xrename(new_filename, backup_filename); |
134 | src_stream = xfopen(backup_filename, "r"); | 134 | src_stream = xfopen_for_read(backup_filename); |
135 | } | 135 | } |
136 | dst_stream = xfopen(new_filename, "w"); | 136 | dst_stream = xfopen_for_write(new_filename); |
137 | fchmod(fileno(dst_stream), saved_stat.st_mode); | 137 | fchmod(fileno(dst_stream), saved_stat.st_mode); |
138 | 138 | ||
139 | printf("patching file %s\n", new_filename); | 139 | printf("patching file %s\n", new_filename); |
diff --git a/editors/sed.c b/editors/sed.c index 67e88418a..496d3d22e 100644 --- a/editors/sed.c +++ b/editors/sed.c | |||
@@ -438,7 +438,7 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr) | |||
438 | bb_error_msg_and_die("command only uses one address"); | 438 | bb_error_msg_and_die("command only uses one address"); |
439 | cmdstr += parse_file_cmd(/*sed_cmd,*/ cmdstr, &sed_cmd->string); | 439 | cmdstr += parse_file_cmd(/*sed_cmd,*/ cmdstr, &sed_cmd->string); |
440 | if (sed_cmd->cmd == 'w') { | 440 | if (sed_cmd->cmd == 'w') { |
441 | sed_cmd->sw_file = xfopen(sed_cmd->string, "w"); | 441 | sed_cmd->sw_file = xfopen_for_write(sed_cmd->string); |
442 | sed_cmd->sw_last_char = '\n'; | 442 | sed_cmd->sw_last_char = '\n'; |
443 | } | 443 | } |
444 | /* handle branch commands */ | 444 | /* handle branch commands */ |
@@ -1025,7 +1025,7 @@ static void process_files(void) | |||
1025 | { | 1025 | { |
1026 | FILE *rfile; | 1026 | FILE *rfile; |
1027 | 1027 | ||
1028 | rfile = fopen(sed_cmd->string, "r"); | 1028 | rfile = fopen_for_read(sed_cmd->string); |
1029 | if (rfile) { | 1029 | if (rfile) { |
1030 | char *line; | 1030 | char *line; |
1031 | 1031 | ||
@@ -1271,7 +1271,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv) | |||
1271 | while (opt_f) { // -f | 1271 | while (opt_f) { // -f |
1272 | char *line; | 1272 | char *line; |
1273 | FILE *cmdfile; | 1273 | FILE *cmdfile; |
1274 | cmdfile = xfopen(llist_pop(&opt_f), "r"); | 1274 | cmdfile = xfopen_for_read(llist_pop(&opt_f)); |
1275 | while ((line = xmalloc_fgetline(cmdfile)) != NULL) { | 1275 | while ((line = xmalloc_fgetline(cmdfile)) != NULL) { |
1276 | add_cmd(line); | 1276 | add_cmd(line); |
1277 | free(line); | 1277 | free(line); |