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

diff --git a/util.c b/util.c
index 3fd65f4f..2b4904d8 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,12 @@ 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;
+    const char    *units, *rem_units;
+    double        remain = rate ? (size-ofs) / rate : 0.0;
 
-    if (ofs == size) pct = 100;
-    
     if (rate > 1024*1024) {
 	    rate /= 1024.0 * 1024.0;
 	    units = "GB/s";
@@ -847,9 +848,20 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
     } else {
 	    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";
+    }
     
-    rprintf(FINFO, "%12.0f %3d%% %7.2f%s%s",
+    rprintf(FINFO, "%12.0f %3d%% %7.2f%s %6.0f%s%s",
 	    (double) ofs, pct, rate, units,
+	    remain, rem_units,
 	    is_last ? "\n" : "\r");
 }