/**
+ * @param ofs Current position in file
+ * @param size Total size of file
* @param is_last True if this is the last time progress will be
* printed for this file, so we should output a newline. (Not
* necessarily the same as all bytes being received.)
{
int pct = (ofs == size) ? 100 : (int)((100.0*ofs)/size);
unsigned long diff = msdiff(&start_time, now);
- double rate = diff ? ((ofs-start_ofs) / diff) * 1000.0/1024.0 : 0;
+ double rate = diff ? (double) (ofs-start_ofs) * 1000.0 / diff / 1024.0 : 0;
const char *units, *rem_units;
- double remain = pct ? ((100.0-pct) * diff / pct / 1000.0) : 0;
+ double remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0;
+ int remain_h, remain_m, remain_s;
if (rate > 1024*1024) {
rate /= 1024.0 * 1024.0;
units = "kB/s";
}
- if (remain > 5*60*60) {
- remain /= 60*60;
- rem_units = "h";
- } if (remain > 5*60) {
- remain /= 60;
- rem_units = "m";
- } else {
- rem_units = "s";
- }
+ remain_s = (int) remain % 60;
+ remain_m = (int) (remain / 60.0) % 60;
+ remain_h = (int) (remain / 3600.0);
- rprintf(FINFO, "%12.0f %3d%% %7.2f%s %5.0f%s%s",
+ rprintf(FINFO, "%12.0f %3d%% %7.2f%s %4d:%02d:%02d%s",
(double) ofs, pct, rate, units,
- remain, rem_units,
+ remain_h, remain_m, remain_s,
is_last ? "\n" : "\r");
}