summaryrefslogtreecommitdiff
path: root/libbb/copyfd.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-04-11 23:20:53 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-04-11 23:20:53 +0000
commit50f7f446ecaadef6895a4ee601567e0b68330637 (patch)
treea10f1d7fd192b8c7ee6cb3d5aa46a0295dd08f2a /libbb/copyfd.c
parentd7c8196c1bba74d1e27ac9cb5e2eb57413daa463 (diff)
downloadbusybox-w32-50f7f446ecaadef6895a4ee601567e0b68330637.tar.gz
busybox-w32-50f7f446ecaadef6895a4ee601567e0b68330637.tar.bz2
busybox-w32-50f7f446ecaadef6895a4ee601567e0b68330637.zip
bb_full_fd_action: remove potential xmalloc from NOFORK path
cat: stop using stdio.h opens libbb: introduce & use open[3]_or_warn function old new delta open3_or_warn - 54 +54 bb_cat 115 144 +29 open_or_warn - 25 +25 unlzma 2404 2412 +8 chattr_main 334 339 +5 xstrtoul_range_sfx 251 255 +4 telnet_main 1514 1510 -4 static.opt 4 - -4 qgravechar 122 118 -4 fuser_add_pid 61 54 -7 fuser_add_inode 154 147 -7 writeFileToTarball 1542 1534 -8 refresh 1156 1148 -8 do_show 856 846 -10 read_leases 212 200 -12 setup_redirects 236 222 -14 iproute_list_or_flush 1582 1568 -14 read_config 427 411 -16 write_leases 284 264 -20 hash_file 338 318 -20 copy_file 1760 1740 -20 do_iproute 2610 2588 -22 bb_full_fd_action 320 269 -51 open_to_or_warn 103 49 -54 fuser_main 1660 1596 -64 .rodata 131160 131096 -64 ------------------------------------------------------------------------------ (add/remove: 2/1 grow/shrink: 4/19 up/down: 125/-423) Total: -298 bytes
Diffstat (limited to 'libbb/copyfd.c')
-rw-r--r--libbb/copyfd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index aa8fbb967..3255e424a 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -14,14 +14,13 @@
14#define BUFSIZ 4096 14#define BUFSIZ 4096
15#endif 15#endif
16 16
17/* Used by NOFORK applets (e.g. cat) - must be very careful 17/* Used by NOFORK applets (e.g. cat) - must not use xmalloc */
18 * when calling xfuncs, allocating memory, with signals, termios, etc... */
19 18
20static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size) 19static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
21{ 20{
22 int status = -1; 21 int status = -1;
23 off_t total = 0; 22 off_t total = 0;
24 RESERVE_CONFIG_BUFFER(buffer, BUFSIZ); 23 char buffer[BUFSIZ];
25 24
26 if (src_fd < 0) 25 if (src_fd < 0)
27 goto out; 26 goto out;
@@ -63,7 +62,6 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
63 } 62 }
64 } 63 }
65 out: 64 out:
66 RELEASE_CONFIG_BUFFER(buffer);
67 return status ? -1 : total; 65 return status ? -1 : total;
68} 66}
69 67