Merge branch 'origin/master' (early part)

4 files changed, 37 insertions, 33 deletions

diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 20e1b8a8b..bcb2db645 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -233,7 +233,7 @@ Special characters:
 
  "a+"   A plus after a char in opt_complementary means that the parameter
         for this option is a nonnegative integer. It will be processed
-        with xatoi_u() - allowed range is 0..INT_MAX.
+        with xatoi_positive() - allowed range is 0..INT_MAX.
 
         int param;  // "unsigned param;" will also work
         opt_complementary = "p+";
@@ -579,8 +579,8 @@ getopt32(char **argv, const char *applet_opts, ...)
                                 llist_add_to_end((llist_t **)(on_off->optarg), optarg);
                 } else if (on_off->param_type == PARAM_INT) {
                         if (optarg)
-//TODO: xatoi_u indirectly pulls in printf machinery
-                                *(unsigned*)(on_off->optarg) = xatoi_u(optarg);
+//TODO: xatoi_positive indirectly pulls in printf machinery
+                                *(unsigned*)(on_off->optarg) = xatoi_positive(optarg);
                 } else if (on_off->optarg) {
                         if (optarg)
                                 *(char **)(on_off->optarg) = optarg;
diff --git a/libbb/progress.c b/libbb/progress.c
index e96039042..f53271398 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -66,16 +66,29 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                 off_t transferred,
                 off_t totalsize)
 {
-        off_t abbrevsize;
+        uoff_t beg_and_transferred;
         unsigned since_last_update, elapsed;
         unsigned ratio;
         int barlength, i;
 
+        /* totalsize == 0 if it is unknown */
+
+        elapsed = monotonic_sec();
+        since_last_update = elapsed - p->lastupdate_sec;
+        /* Do not update on every call
+         * (we can be called on every network read!) */
+        if (since_last_update == 0 && !totalsize)
+                        return;
+
+        beg_and_transferred = beg_range + transferred;
         ratio = 100;
-        if (totalsize) {
+        if (beg_and_transferred < totalsize) {
+                /* Do not update on every call
+                 * (we can be called on every network read!) */
+                if (since_last_update == 0)
+                        return;
                 /* long long helps to have it working even if !LFS */
-                ratio = (unsigned) (100ULL * (transferred+beg_range) / totalsize);
-                if (ratio > 100) ratio = 100;
+                ratio = 100ULL * beg_and_transferred / (uoff_t)totalsize;
         }
 
 #if ENABLE_UNICODE_SUPPORT
@@ -95,35 +108,33 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                 /* back to multibyte; cant overflow */
                 wcstombs(buf, wbuf21, INT_MAX);
                 len = (len > 20) ? 0 : 20 - len;
-                fprintf(stderr, "\r%s%*s%4d%% ", buf, len, "", ratio);
+                fprintf(stderr, "\r%s%*s%4u%% ", buf, len, "", ratio);
                 free(buf);
         }
 #else
-        fprintf(stderr, "\r%-20.20s%4d%% ", curfile, ratio);
+        fprintf(stderr, "\r%-20.20s%4u%% ", curfile, ratio);
 #endif
 
         barlength = get_tty2_width() - 49;
         if (barlength > 0) {
                 /* god bless gcc for variable arrays :) */
-                i = barlength * ratio / 100;
-                {
-                        char buf[i+1];
-                        memset(buf, '*', i);
-                        buf[i] = '\0';
-                        fprintf(stderr, "|%s%*s|", buf, barlength - i, "");
-                }
+                char buf[barlength + 1];
+                unsigned stars = (unsigned)barlength * ratio / (unsigned)100;
+                memset(buf, ' ', barlength);
+                buf[barlength] = '\0';
+                memset(buf, '*', stars);
+                fprintf(stderr, "|%s|", buf);
         }
+
         i = 0;
-        abbrevsize = transferred + beg_range;
-        while (abbrevsize >= 100000) {
+        while (beg_and_transferred >= 100000) {
                 i++;
-                abbrevsize >>= 10;
+                beg_and_transferred >>= 10;
         }
         /* see http://en.wikipedia.org/wiki/Tera */
-        fprintf(stderr, "%6d%c ", (int)abbrevsize, " kMGTPEZY"[i]);
+        fprintf(stderr, "%6u%c ", (unsigned)beg_and_transferred, " kMGTPEZY"[i]);
+#define beg_and_transferred dont_use_beg_and_transferred_below
 
-        elapsed = monotonic_sec();
-        since_last_update = elapsed - p->lastupdate_sec;
         if (transferred > p->lastsize) {
                 p->lastupdate_sec = elapsed;
                 p->lastsize = transferred;
@@ -144,10 +155,10 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                         fprintf(stderr, "--:--:-- ETA");
                 } else {
                         /* to_download / (transferred/elapsed) - elapsed: */
-                        int eta = (int) ((unsigned long long)to_download*elapsed/transferred - elapsed);
                         /* (long long helps to have working ETA even if !LFS) */
-                        i = eta % 3600;
-                        fprintf(stderr, "%02d:%02d:%02d ETA", eta / 3600, i / 60, i % 60);
+                        unsigned eta = (unsigned long long)to_download*elapsed/(uoff_t)transferred - elapsed;
+                        unsigned secs = eta % 3600;
+                        fprintf(stderr, "%02u:%02u:%02u ETA", eta / 3600, secs / 60, secs % 60);
                 }
         }
 }
diff --git a/libbb/rtc.c b/libbb/rtc.c
index fcd6c64d7..97d18ed53 100644
--- a/libbb/rtc.c
+++ b/libbb/rtc.c
@@ -22,13 +22,6 @@ int FAST_FUNC rtc_adjtime_is_utc(void)
                 char buffer[128];
 
                 while (fgets(buffer, sizeof(buffer), f)) {
-                        int len = strlen(buffer);
-
-                        while (len && isspace(buffer[len - 1]))
-                                len--;
-
-                        buffer[len] = 0;
-
                         if (strncmp(buffer, "UTC", 3) == 0) {
                                 utc = 1;
                                 break;
diff --git a/libbb/xatonum.c b/libbb/xatonum.c
index 3cdf63425..60b65f525 100644
--- a/libbb/xatonum.c
+++ b/libbb/xatonum.c
@@ -59,7 +59,7 @@ unsigned bb_strtoui(const char *str, char **end, int b)
 
 /* A few special cases */
 
-int FAST_FUNC xatoi_u(const char *numstr)
+int FAST_FUNC xatoi_positive(const char *numstr)
 {
         return xatou_range(numstr, 0, INT_MAX);
 }