Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ChangeSet@1.12: tls now shows number of links to a file to aid in testing -H
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
2b4904d
..
0006b00
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-835,9
+835,10
@@
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
{
int pct = (ofs == size) ? 100 : (int)((100.0*ofs)/size);
unsigned long diff = msdiff(&start_time, now);
{
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;
const char *units, *rem_units;
- double remain = rate ? (size-ofs) / rate : 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;
if (rate > 1024*1024) {
rate /= 1024.0 * 1024.0;
@@
-849,19
+850,13
@@
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
units = "kB/s";
}
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 %
6.0f%s
%s",
+ rprintf(FINFO, "%12.0f %3d%% %7.2f%s %
4d:%02d:%02d
%s",
(double) ofs, pct, rate, units,
(double) ofs, pct, rate, units,
- remain
, rem_unit
s,
+ remain
_h, remain_m, remain_
s,
is_last ? "\n" : "\r");
}
is_last ? "\n" : "\r");
}