1 files changed, 9 insertions, 11 deletions

diff --git a/libbb/progress.c b/libbb/progress.c
index 372feb0c2..3c2f01667 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -45,13 +45,6 @@ enum {
         STALLTIME = 5
 };
 
-static unsigned int get_tty2_width(void)
-{
-        unsigned width;
-        get_terminal_width_height(2, &width, NULL);
-        return width;
-}
-
 void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
 {
 #if ENABLE_UNICODE_SUPPORT
@@ -80,7 +73,7 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
 {
         uoff_t beg_and_transferred;
         unsigned since_last_update, elapsed;
-        int barlength;
+        int notty;
         int kiloscale;
 
         //transferred = 1234; /* use for stall detection testing */
@@ -137,18 +130,21 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                 }
         }
 
+        notty = !isatty(STDERR_FILENO);
+
         if (ENABLE_UNICODE_SUPPORT)
-                fprintf(stderr, "\r%s", p->curfile);
+                fprintf(stderr, "\r%s" + notty, p->curfile);
         else
-                fprintf(stderr, "\r%-20.20s", p->curfile);
+                fprintf(stderr, "\r%-20.20s" + notty, p->curfile);
 
         beg_and_transferred = beg_size + transferred;
 
         if (totalsize != 0) {
+                int barlength;
                 unsigned ratio = 100 * beg_and_transferred / totalsize;
                 fprintf(stderr, "%4u%%", ratio);
 
-                barlength = get_tty2_width() - 49;
+                barlength = get_terminal_width(2) - 49;
                 if (barlength > 0) {
                         /* god bless gcc for variable arrays :) */
                         char buf[barlength + 1];
@@ -204,4 +200,6 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                 hours = eta / 3600;
                 fprintf(stderr, "%3u:%02u:%02u ETA", hours, secs / 60, secs % 60);
         }
+        if (notty)
+                fputc('\n', stderr);
 }