Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/progress.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/progress.c (modified) (4 diffs)

branches/3.3/mindi-busybox/libbb/progress.c

@@ -45 +45 @@
     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)
@@ -81 +74 @@
     uoff_t beg_and_transferred;
     unsigned since_last_update, elapsed;
-    int barlength;
+    int notty;
     int kiloscale;
 
@@ -138 +131 @@
     }
 
+    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 :) */
@@ -205 +201 @@
         fprintf(stderr, "%3u:%02u:%02u ETA", hours, secs / 60, secs % 60);
     }
+    if (notty)
+        fputc('\n', stderr);
 }