X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/47f1218d6949a1156034f734cc746b19e759566f..f389ac80a9d8890a271aac96401070c83fdac8f3:/util.c

diff --git a/util.c b/util.c
index 3fd65f4f..0006b006 100644
--- a/util.c
+++ b/util.c
@@ -824,6 +824,8 @@ static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
 
 
 /**
+ * @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.)
@@ -831,13 +833,13 @@ static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
 static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
 			    int is_last)
 {
-    int           pct  = (int)((100.0*ofs)/size);
+    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;
-    const char    *units;
+    double        rate = diff ? (double) (ofs-start_ofs) * 1000.0 / diff / 1024.0 : 0;
+    const char    *units, *rem_units;
+    double        remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0;
+    int 	  remain_h, remain_m, remain_s;
 
-    if (ofs == size) pct = 100;
-    
     if (rate > 1024*1024) {
 	    rate /= 1024.0 * 1024.0;
 	    units = "GB/s";
@@ -847,9 +849,14 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
     } else {
 	    units = "kB/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%s",
+    rprintf(FINFO, "%12.0f %3d%% %7.2f%s %4d:%02d:%02d%s",
 	    (double) ofs, pct, rate, units,
+	    remain_h, remain_m, remain_s,
 	    is_last ? "\n" : "\r");
 }