aboutsummaryrefslogtreecommitdiff
path: root/networking/tftp.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:09:59 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:09:59 +0000
commit5d61e71c3a8ac3296afbfe9a014c62050c5a9234 (patch)
treee9ab2cd35d1f2d51b26a678551a0439b1719928b /networking/tftp.c
parentc9dc2ac578278e86be248cc21e53081f7054da83 (diff)
downloadbusybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.gz
busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.bz2
busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.zip
introduce safe_poll (fixes a problem in top)
function old new delta safe_poll - 77 +77 svlogd_main 1470 1466 -4 zcip_main 1530 1524 -6 forkexec 1345 1338 -7 decode_format_string 795 788 -7 collect_blk 474 467 -7 buffer_pread 540 532 -8 tftp 1182 1172 -10 microcom_main 763 749 -14 arpping 441 424 -17 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/9 up/down: 77/-80) Total: -3 bytes text data bss dec hex filename 770162 1034 10404 781600 bed20 busybox_old 770158 1034 10404 781596 bed1c busybox_unstripped
Diffstat (limited to 'networking/tftp.c')
-rw-r--r--networking/tftp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/tftp.c b/networking/tftp.c
index ac3a86afb..59f53ae4a 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -225,7 +225,7 @@ static int tftp( USE_GETPUT(const int cmd,)
225 /* Receive packet */ 225 /* Receive packet */
226 /*pfd[0].fd = socketfd;*/ 226 /*pfd[0].fd = socketfd;*/
227 pfd[0].events = POLLIN; 227 pfd[0].events = POLLIN;
228 switch (poll(pfd, 1, waittime_ms)) { 228 switch (safe_poll(pfd, 1, waittime_ms)) {
229 unsigned from_port; 229 unsigned from_port;
230 case 1: 230 case 1:
231 from->len = peer_lsa->len; 231 from->len = peer_lsa->len;
@@ -262,7 +262,7 @@ static int tftp( USE_GETPUT(const int cmd,)
262 262
263 goto send_again; /* resend last sent pkt */ 263 goto send_again; /* resend last sent pkt */
264 default: 264 default:
265 bb_perror_msg("poll"); 265 /*bb_perror_msg("poll"); - done in safe_poll */
266 goto ret; 266 goto ret;
267 } 267 }
268 process_pkt: 268 process_pkt: