From 56efa5647422b364aa644f557f9d9ebc2b198e97 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 5 Mar 2005 17:49:46 +0000 Subject: [PATCH] Fixed the elapsed time reported for 0-length files. --- progress.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/progress.c b/progress.c index 22e0955e..8192c35d 100644 --- a/progress.c +++ b/progress.c @@ -67,17 +67,18 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, if (is_last) { /* Compute stats based on the starting info. */ - diff = msdiff(&ph_start.time, now); - if (!diff) + if (!ph_start.time.tv_sec + || !(diff = msdiff(&ph_start.time, now))) diff = 1; rate = (double) (ofs - ph_start.ofs) * 1000.0 / diff / 1024.0; /* Switch to total time taken for our last update. */ remain = (double) diff / 1000.0; } else { /* Compute stats based on recent progress. */ - diff = msdiff(&ph_list[oldest_hpos].time, now); - rate = diff ? (double) (ofs - ph_list[oldest_hpos].ofs) * 1000.0 - / diff / 1024.0 : 0; + if (!(diff = msdiff(&ph_list[oldest_hpos].time, now))) + diff = 1; + rate = (double) (ofs - ph_list[oldest_hpos].ofs) * 1000.0 + / diff / 1024.0; remain = rate ? (double) (size - ofs) / rate / 1000.0 : 0.0; } -- 2.34.1