Fix wrong human-readable ETA output.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5039f49e9ff2d1d2439128033b62ed92f2dd89c0..31170b7097918e87bf3378674d4f31fe2ebf1406 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-17  Steven Schubiger  <stsc@member.fsf.org>
+
+       * progress.c (eta_to_human_short): Fix the remaining hours
+       to be displayed. Spotted by Tadeu Martins (#26411).
+
 2009-04-24  Micah Cowan  <micah@cowan.name>
 
        * hash.c: Change stdint.h inclusion to use HAVE_STDINT_H, not C99

diff --git a/src/progress.c b/src/progress.c
index 2f1c22259dd1800579a5e94edb704436ac570a6f..9b9d1e49e4f82a107eb04329ba6fe10ae83abb87 100644 (file)
--- a/src/progress.c
+++ b/src/progress.c
@@ -1157,7 +1157,7 @@ eta_to_human_short (int secs, bool condensed)
   else if (secs < 48 * 3600)
     sprintf (buf, "%dh%s%dm", secs / 3600, space, (secs / 60) % 60);
   else if (secs < 100 * 86400)
-    sprintf (buf, "%dd%s%dh", secs / 86400, space, (secs / 3600) % 60);
+    sprintf (buf, "%dd%s%dh", secs / 86400, space, (secs / 3600) % 24);
   else
     /* even (2^31-1)/86400 doesn't overflow BUF. */
     sprintf (buf, "%dd", secs / 86400);