summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2011-01-10 12:51:44 +0100
committerDenys Vlasenko2011-01-10 12:51:44 +0100
commit84dba9c5bbd99cb80c0e201bbffa27a51766c63f (patch)
treed872deb94f11d7c7104ffa00d48c0e3dae126541 /libbb
parent7b305646e12536e9aa62d2768d48bf2d2d78caa5 (diff)
downloadbusybox-84dba9c5bbd99cb80c0e201bbffa27a51766c63f.zip
busybox-84dba9c5bbd99cb80c0e201bbffa27a51766c63f.tar.gz
tftp: fix bad interaction betweel poll() and alarm(). Closes bug 3061
This was breaking timeout handling. function old new delta tftp_progress_update - 45 +45 tftp_progress_done - 32 +32 tftp_protocol 1839 1858 +19 tftp_progress_init 9 15 +6 tftp_main 298 286 -12 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 2/1 up/down: 102/-12) Total: 90 bytes Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/progress.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/progress.c b/libbb/progress.c
index 4c2763c..74e80a3 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -78,7 +78,7 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
/* Do not update on every call
* (we can be called on every network read!) */
if (since_last_update == 0 && !totalsize)
- return;
+ return;
beg_and_transferred = beg_range + transferred;
ratio = 100;