Clean up the ETA logic a bit and make sure it works for restarted transfers.

1 files changed, 8 insertions, 7 deletions

diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index a9bb328e2bb4..087d09c0113b 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -125,16 +125,17 @@ struct xferstat {
 static void
 stat_eta(struct xferstat *xs)
 {
-	long elapsed, remaining;
+	long elapsed, received, expected, eta;
 
 	elapsed = xs->last.tv_sec - xs->start.tv_sec;
-	remaining = ((xs->size * elapsed) / xs->rcvd) - elapsed;
-	if (remaining > 3600) {
-		fprintf(stderr, "%02ld:", remaining / 3600);
-		remaining %= 3600;
+	received = xs->rcvd - xs->offset;
+	expected = xs->size - xs->rcvd;
+	eta = (elapsed * expected) / received;
+	if (eta > 3600) {
+		fprintf(stderr, "%02ld:", eta / 3600);
+		eta %= 3600;
 	}
-	fprintf(stderr, "%02ld:%02ld",
-	    remaining / 60, remaining % 60);
+	fprintf(stderr, "%02ld:%02ld", eta / 60, eta % 60);
 }
 
 /*