updatre with latest from tzcode.

[bsd-progress.git] / progressbar.c

diff --git a/progressbar.c b/progressbar.c
index 4ee520b1e126a75902742b1741288f6238bf18c2..2350776d6bb24102c85de3ba5fe356d99743d758 100644 (file)
--- a/progressbar.c
+++ b/progressbar.c
@@ -1,7 +1,7 @@
-/*     $NetBSD: progressbar.c,v 1.12 2006/05/01 23:00:33 christos Exp $        */
+/*     $NetBSD: progressbar.c,v 1.22 2012/06/27 22:07:36 riastradh Exp $       */

 
 /*-
 
 /*-

- * Copyright (c) 1997-2005 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.

  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation


@@ -15,13 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the NetBSD
- *     Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.

  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED


@@ -38,14 +31,15 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
 
 #include <sys/cdefs.h>
 #ifndef lint

-__RCSID("$NetBSD: progressbar.c,v 1.12 2006/05/01 23:00:33 christos Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.22 2012/06/27 22:07:36 riastradh Exp $");

 #endif /* not lint */
 
 /*
  * FTP User Program -- Misc support routines
  */
 #endif /* not lint */
 
 /*
  * FTP User Program -- Misc support routines
  */

-#include <sys/types.h>

 #include <sys/param.h>
 #include <sys/param.h>

+#include <sys/types.h>
+#include <sys/time.h>

 
 #include <err.h>
 #include <errno.h>
 
 #include <err.h>
 #include <errno.h>


@@ -91,10 +85,23 @@ updateprogressmeter(int dummy)
 }
 
 /*
 }
 
 /*

- * List of order of magnitude prefixes.
- * The last is `P', as 2^64 = 16384 Petabytes
+ * List of order of magnitude suffixes, per IEC 60027-2.

  */
  */

-static const char prefixes[] = " KMGTP";
+static const char * const suffixes[] = {
+       "",     /* 2^0  (byte) */
+       "KiB",  /* 2^10 Kibibyte */
+       "MiB",  /* 2^20 Mebibyte */
+       "GiB",  /* 2^30 Gibibyte */
+       "TiB",  /* 2^40 Tebibyte */
+       "PiB",  /* 2^50 Pebibyte */
+       "EiB",  /* 2^60 Exbibyte */
+#if 0
+               /* The following are not necessary for signed 64-bit off_t */
+       "ZiB",  /* 2^70 Zebibyte */
+       "YiB",  /* 2^80 Yobibyte */
+#endif
+};
+#define NSUFFIXES      (int)(sizeof(suffixes) / sizeof(suffixes[0]))

 
 /*
  * Display a transfer progress bar if progress is non-zero.
 
 /*
  * Display a transfer progress bar if progress is non-zero.


@@ -135,7 +142,7 @@ progressmeter(int flag)
        size_t          len;
        char            buf[256];       /* workspace for progress bar */
 #ifndef NO_PROGRESS
        size_t          len;
        char            buf[256];       /* workspace for progress bar */
 #ifndef NO_PROGRESS

-#define        BAROVERHEAD     43              /* non `*' portion of progress bar */
+#define        BAROVERHEAD     45              /* non `*' portion of progress bar */

                                        /*
                                         * stars should contain at least
                                         * sizeof(buf) - BAROVERHEAD entries
                                        /*
                                         * stars should contain at least
                                         * sizeof(buf) - BAROVERHEAD entries


@@ -167,8 +174,8 @@ progressmeter(int flag)
                            "transfer aborted because stalled for %lu sec.\r\n",
                            getprogname(), (unsigned long)wait.tv_sec);
                        (void)write(fileno(ttyout), buf, len);
                            "transfer aborted because stalled for %lu sec.\r\n",
                            getprogname(), (unsigned long)wait.tv_sec);
                        (void)write(fileno(ttyout), buf, len);

-                       (void)xsignal(SIGALRM, SIG_DFL);

                        alarmtimer(0);
                        alarmtimer(0);

+                       (void)xsignal(SIGALRM, SIG_DFL);

                        siglongjmp(toplevel, 1);
                }
 #endif /* !STANDALONE_PROGRESS */
                        siglongjmp(toplevel, 1);
                }
 #endif /* !STANDALONE_PROGRESS */


@@ -185,8 +192,8 @@ progressmeter(int flag)
                        (void)xsignal_restart(SIGALRM, updateprogressmeter, 1);
                        alarmtimer(1);          /* set alarm timer for 1 Hz */
                } else if (flag == 1) {
                        (void)xsignal_restart(SIGALRM, updateprogressmeter, 1);
                        alarmtimer(1);          /* set alarm timer for 1 Hz */
                } else if (flag == 1) {

-                       (void)xsignal(SIGALRM, SIG_DFL);

                        alarmtimer(0);
                        alarmtimer(0);

+                       (void)xsignal(SIGALRM, SIG_DFL);

                }
        }
 #ifndef NO_PROGRESS
                }
        }
 #ifndef NO_PROGRESS


@@ -213,7 +220,7 @@ progressmeter(int flag)
                         * calculate the length of the `*' bar, ensuring that
                         * the number of stars won't exceed the buffer size
                         */
                         * calculate the length of the `*' bar, ensuring that
                         * the number of stars won't exceed the buffer size
                         */

-               barlength = MIN(sizeof(buf) - 1, ttywidth) - BAROVERHEAD;
+               barlength = MIN((int)(sizeof(buf) - 1), ttywidth) - BAROVERHEAD;

                if (prefix)
                        barlength -= (int)strlen(prefix);
                if (barlength > 0) {
                if (prefix)
                        barlength -= (int)strlen(prefix);
                if (barlength > 0) {


@@ -224,14 +231,13 @@ progressmeter(int flag)
        }
 
        abbrevsize = cursize;
        }
 
        abbrevsize = cursize;

-       for (i = 0; abbrevsize >= 100000 && i < sizeof(prefixes); i++)
+       for (i = 0; abbrevsize >= 100000 && i < NSUFFIXES; i++)

                abbrevsize >>= 10;
                abbrevsize >>= 10;

-       if (i == sizeof(prefixes))
+       if (i == NSUFFIXES)

                i--;
                i--;

-       len += snprintf(buf + len, BUFLEFT, " " LLFP("5") " %c%c ",
+       len += snprintf(buf + len, BUFLEFT, " " LLFP("5") " %-3s ",

            (LLT)abbrevsize,
            (LLT)abbrevsize,

-           prefixes[i],
-           i == 0 ? ' ' : 'B');
+           suffixes[i]);

 
        timersub(&now, &start, &td);
        elapsed = td.tv_sec + (td.tv_usec / 1000000.0);
 
        timersub(&now, &start, &td);
        elapsed = td.tv_sec + (td.tv_usec / 1000000.0);


@@ -242,13 +248,13 @@ progressmeter(int flag)
                if (elapsed > 0.0)
                        bytespersec /= elapsed;
        }
                if (elapsed > 0.0)
                        bytespersec /= elapsed;
        }

-       for (i = 1; bytespersec >= 1024000 && i < sizeof(prefixes); i++)
+       for (i = 1; bytespersec >= 1024000 && i < NSUFFIXES; i++)

                bytespersec >>= 10;
        len += snprintf(buf + len, BUFLEFT,
                bytespersec >>= 10;
        len += snprintf(buf + len, BUFLEFT,

-           " " LLFP("3") ".%02d %cB/s ",
+           " " LLFP("3") ".%02d %.2sB/s ",

            (LLT)(bytespersec / 1024),
            (int)((bytespersec % 1024) * 100 / 1024),
            (LLT)(bytespersec / 1024),
            (int)((bytespersec % 1024) * 100 / 1024),

-           prefixes[i]);
+           suffixes[i]);

 
        if (filesize > 0) {
                if (bytes <= 0 || elapsed <= 0.0 || cursize > filesize) {
 
        if (filesize > 0) {
                if (bytes <= 0 || elapsed <= 0.0 || cursize > filesize) {


@@ -334,12 +340,14 @@ ptransfer(int siginfo)
        len += snprintf(buf + len, BUFLEFT,
            "%02d:%02d ", remaining / 60, remaining % 60);
 
        len += snprintf(buf + len, BUFLEFT,
            "%02d:%02d ", remaining / 60, remaining % 60);
 

-       for (i = 1; bytespersec >= 1024000 && i < sizeof(prefixes); i++)
+       for (i = 1; bytespersec >= 1024000 && i < NSUFFIXES; i++)

                bytespersec >>= 10;
                bytespersec >>= 10;

-       len += snprintf(buf + len, BUFLEFT, "(" LLF ".%02d %cB/s)",
+       if (i == NSUFFIXES)
+               i--;
+       len += snprintf(buf + len, BUFLEFT, "(" LLF ".%02d %.2sB/s)",

            (LLT)(bytespersec / 1024),
            (int)((bytespersec % 1024) * 100 / 1024),
            (LLT)(bytespersec / 1024),
            (int)((bytespersec % 1024) * 100 / 1024),

-           prefixes[i]);
+           suffixes[i]);

 
        if (siginfo && bytes > 0 && elapsed > 0.0 && filesize >= 0
            && bytes + restart_point <= filesize) {
 
        if (siginfo && bytes > 0 && elapsed > 0.0 && filesize >= 0
            && bytes + restart_point <= filesize) {


@@ -457,7 +465,7 @@ xsignal(int sig, sigfunc func)
                 * This is unpleasant, but I don't know what would be better.
                 * Right now, this "can't happen"
                 */
                 * This is unpleasant, but I don't know what would be better.
                 * Right now, this "can't happen"
                 */

-               errx(1, "xsignal_restart called with signal %d", sig);
+               errx(1, "xsignal_restart: called with signal %d", sig);

        }
 
        return(xsignal_restart(sig, func, restartable));
        }
 
        return(xsignal_restart(sig, func, restartable));