* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
int is_last)
{
- char eol[256];
+ char rembuf[64], eol[128];
const char *units;
int pct = ofs == size ? 100 : (int) (100.0 * ofs / size);
unsigned long diff;
double rate, remain;
- int remain_h, remain_m, remain_s;
if (is_last) {
/* Compute stats based on the starting info. */
units = "kB/s";
}
- remain_s = (int) remain % 60;
- remain_m = (int) (remain / 60.0) % 60;
- remain_h = (int) (remain / 3600.0);
+ if (remain < 0)
+ strlcpy(rembuf, " ??:??:??", sizeof rembuf);
+ else {
+ snprintf(rembuf, sizeof rembuf, "%4d:%02d:%02d",
+ (int) (remain / 3600.0),
+ (int) (remain / 60.0) % 60,
+ (int) remain % 60);
+ }
if (is_last) {
snprintf(eol, sizeof eol, " (xfer#%d, to-check=%d/%d)\n",
stats.num_files);
} else
strlcpy(eol, "\r", sizeof eol);
- rprintf(FCLIENT, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s",
- human_num(ofs), pct, rate, units,
- remain_h, remain_m, remain_s, eol);
+ rprintf(FCLIENT, "%12s %3d%% %7.2f%s %s%s",
+ human_num(ofs), pct, rate, units, rembuf, eol);
}
void end_progress(OFF_T size)