nologin: make it possible to build it as single applet

[oweals/busybox.git] / libbb / progress.c

diff --git a/libbb/progress.c b/libbb/progress.c
index f1d980d68b25f51f6f3953ee030ba4eedcb1d18b..d071ce70511b47054be773bf917c1d867f11244d 100644 (file)
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -57,6 +57,9 @@ void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
        p->last_update_sec = p->start_sec;
        p->last_change_sec = p->start_sec;
        p->last_size = 0;
+#if 0
+       p->last_eta = INT_MAX;
+#endif
 }
 
 /* File already had beg_size bytes.
@@ -66,7 +69,7 @@ void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
  * will be "totalsize" bytes.
  * If totalsize == 0, then it is unknown.
  */
-void FAST_FUNC bb_progress_update(bb_progress_t *p,
+int FAST_FUNC bb_progress_update(bb_progress_t *p,
                uoff_t beg_size,
                uoff_t transferred,
                uoff_t totalsize)
@@ -91,7 +94,7 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                 * Do not update on every call
                 * (we can be called on every network read!)
                 */
-               return;
+               return -1;
        }
 
        /* Before we lose real, unscaled sizes, produce human-readable size string */
@@ -192,10 +195,21 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                /* if 32bit, can overflow ^^^^^^^^^^, but this would only show bad ETA */
                if (eta >= 1000*60*60)
                        eta = 1000*60*60 - 1;
+#if 0
+               /* To prevent annoying "back-and-forth" estimation jitter,
+                * if new ETA is larger than the last just by a few seconds,
+                * disregard it, and show last one. The end result is that
+                * ETA usually only decreases, unless download slows down a lot.
+                */
+               if ((unsigned)(eta - p->last_eta) < 10)
+                       eta = p->last_eta;
+               p->last_eta = eta;
+#endif
                secs = eta % 3600;
                hours = eta / 3600;
                fprintf(stderr, "%3u:%02u:%02u ETA", hours, secs / 60, secs % 60);
        }
        if (notty)
                fputc('\n', stderr);
+       return notty;
 }