Commit d1d0a705 authored by Wayne Davison's avatar Wayne Davison

Don't output a negative time-remaining value if the file has grown.

parent 444f9f7b
...@@ -59,12 +59,11 @@ static unsigned long msdiff(struct timeval *t1, struct timeval *t2) ...@@ -59,12 +59,11 @@ static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
int is_last) int is_last)
{ {
char eol[256]; char rembuf[64], eol[128];
const char *units; const char *units;
int pct = ofs == size ? 100 : (int) (100.0 * ofs / size); int pct = ofs == size ? 100 : (int) (100.0 * ofs / size);
unsigned long diff; unsigned long diff;
double rate, remain; double rate, remain;
int remain_h, remain_m, remain_s;
if (is_last) { if (is_last) {
/* Compute stats based on the starting info. */ /* Compute stats based on the starting info. */
...@@ -93,9 +92,14 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, ...@@ -93,9 +92,14 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
units = "kB/s"; units = "kB/s";
} }
remain_s = (int) remain % 60; if (remain < 0)
remain_m = (int) (remain / 60.0) % 60; strlcpy(rembuf, " ??:??:??", sizeof rembuf);
remain_h = (int) (remain / 3600.0); else {
snprintf(rembuf, sizeof rembuf, "%4d:%02d:%02d",
(int) (remain / 3600.0),
(int) (remain / 60.0) % 60,
(int) remain % 60);
}
if (is_last) { if (is_last) {
snprintf(eol, sizeof eol, " (xfer#%d, to-check=%d/%d)\n", snprintf(eol, sizeof eol, " (xfer#%d, to-check=%d/%d)\n",
...@@ -104,9 +108,8 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, ...@@ -104,9 +108,8 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
stats.num_files); stats.num_files);
} else } else
strlcpy(eol, "\r", sizeof eol); strlcpy(eol, "\r", sizeof eol);
rprintf(FCLIENT, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s", rprintf(FCLIENT, "%12s %3d%% %7.2f%s %s%s",
human_num(ofs), pct, rate, units, human_num(ofs), pct, rate, units, rembuf, eol);
remain_h, remain_m, remain_s, eol);
} }
void end_progress(OFF_T size) void end_progress(OFF_T size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment