3 files changed, 17 insertions, 4 deletions

diff --git a/libbb/capability.c b/libbb/capability.c
index f60062bfc..6587dcbf7 100644
--- a/libbb/capability.c
+++ b/libbb/capability.c
@@ -3,7 +3,8 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-//kbuild:lib-$(CONFIG_PLATFORM_LINUX) += capability.o
+//kbuild:lib-$(CONFIG_FEATURE_SETPRIV_CAPABILITIES) += capability.o
+//kbuild:lib-$(CONFIG_RUN_INIT) += capability.o
 
 #include <linux/capability.h>
 // #include <sys/capability.h>
diff --git a/libbb/progress.c b/libbb/progress.c
index f1d980d68..23e974ce7 100644
--- 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.
@@ -192,6 +195,16 @@ 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);
diff --git a/libbb/skip_whitespace.c b/libbb/skip_whitespace.c
index 4df5d9e4d..37a24d3be 100644
--- a/libbb/skip_whitespace.c
+++ b/libbb/skip_whitespace.c
@@ -32,7 +32,6 @@ char* FAST_FUNC skip_non_whitespace(const char *s)
 
 char* FAST_FUNC skip_dev_pfx(const char *tty_name)
 {
-        if (is_prefixed_with(tty_name, "/dev/"))
-                tty_name += 5;
-        return (char*)tty_name;
+        char *unprefixed = is_prefixed_with(tty_name, "/dev/");
+        return unprefixed ? unprefixed : (char*)tty_name;
 }