 @@ -1,14 +1,14 @@
-/*	$NetBSD: progressbar.c,v 1.22 2012/06/27 22:07:36 riastradh Exp $	*/
+/*	$NetBSD: progressbar.c,v 1.23 2019/06/22 23:40:33 christos Exp $	*/
 /*-
  * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: progressbar.c,v 1.22 2012/06/27 22:07:36 riastradh Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.23 2019/06/22 23:40:33 christos Exp $");
 #endif /* not lint */
 /*
  * FTP User Program -- Misc support routines
  */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <err.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 @@ -77,41 +77,43 @@ static void updateprogressmeter(int);
  */
 static void
 updateprogressmeter(int dummy)
+{
 	int oerrno = errno;
 	progressmeter(0);
 	errno = oerrno;
+}
 /*
  * List of order of magnitude suffixes, per IEC 60027-2.
  */
 #if !defined(NO_PROGRESS) || !defined(STANDALONE_PROGRESS)
 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]))
 #endif
 /*
  * Display a transfer progress bar if progress is non-zero.
  * SIGALRM is hijacked for use by this function.
  * - Before the transfer, set filesize to size of file (or -1 if unknown),
  *   and call with flag = -1. This starts the once per second timer,
  *   and a call to updateprogressmeter() upon SIGALRM.
  * - During the transfer, updateprogressmeter will call progressmeter
  *   with flag = 0
  * - After the transfer, call with flag = 1
  */
 static struct timeval start;
 static struct timeval lastupdate;
 @@ -129,28 +131,30 @@ progressmeter(int flag)
 	off_t abbrevsize, bytespersec;
 	double elapsed;
 	int ratio, i, remaining, barlength;
 			/*
 			 * Work variables for progress bar.
+			 *
 			 * XXX:	if the format of the progress bar changes
 			 *	(especially the number of characters in the
 			 *	`static' portion of it), be sure to update
 			 *	these appropriately.
 			 */
 #endif
 #if !defined(NO_PROGRESS) || !defined(STANDALONE_PROGRESS)
 	size_t		len;
 	char		buf[256];	/* workspace for progress bar */
 #endif
 #ifndef NO_PROGRESS
 #define	BAROVERHEAD	45		/* non `*' portion of progress bar */
 					/*
 					 * stars should contain at least
 					 * sizeof(buf) - BAROVERHEAD entries
 					 */
 	static const char	stars[] =
 "*****************************************************************************"
 "*****************************************************************************"
 "*****************************************************************************";
 #endif