 @@ -1,17 +1,17 @@
-/*	$NetBSD: ftp.c,v 1.168 2019/02/04 04:09:13 mrg Exp $	*/
+/*	$NetBSD: ftp.c,v 1.168.2.1 2021/01/29 20:58:19 martin Exp $	*/
 /*-
- * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996-2021 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.
  * 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.
 @@ -82,27 +82,27 @@
  * 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
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.168 2019/02/04 04:09:13 mrg Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.168.2.1 2021/01/29 20:58:19 martin Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <arpa/ftp.h>
 @@ -568,27 +568,27 @@ abortxfer(int notused)
 		strlcpy(msgbuf, "\nsend", sizeof(msgbuf));
 		break;
 	default:
 		errx(1, "abortxfer: unknown direction `%s'", direction);
+	}
 	len = strlcat(msgbuf, " aborted. Waiting for remote to finish abort.\n",
 	    sizeof(msgbuf));
 	write(fileno(ttyout), msgbuf, len);
 	siglongjmp(xferabort, 1);
+}
 /*
  * Read data from infd & write to outfd, using buf/bufsize as the temporary
- * buffer, dealing with short writes.
+ * buffer, dealing with short reads or writes.
  * If rate_limit != 0, rate-limit the transfer.
  * If hash_interval != 0, fputc('c', ttyout) every hash_interval bytes.
  * Updates global variables: bytes.
  * Returns 0 if ok, 1 if there was a read error, 2 if there was a write error.
  * In the case of error, errno contains the appropriate error code.
  */
 static int
 copy_bytes(int infd, int outfd, char *buf, size_t bufsize,
 	int rate_limit, int hash_interval)
+{
 	volatile off_t	hashc;
 	ssize_t		inc, outc;
 	char		*bufp;
 @@ -602,35 +602,45 @@ copy_bytes(int infd, int outfd, char *bu
 	else
 		bufchunk = bufsize;
 	while (1) {
 		if (rate_limit) {
 			(void)gettimeofday(&tvthen, NULL);
+		}
 		errno = 0;
 		inc = outc = 0;
 					/* copy bufchunk at a time */
 		bufrem = bufchunk;
 		while (bufrem > 0) {
 			inc = read(infd, buf, MIN((off_t)bufsize, bufrem));
-			if (inc <= 0)
+			if (inc < 0) {
 				if (errno == EINTR || errno == EAGAIN) {
 					continue;
+				}
 				goto copy_done;
 			} else if (inc == 0) {
 				goto copy_done;
+			}
 			bytes += inc;
 			bufrem -= inc;
 			bufp = buf;
 			while (inc > 0) {
 				outc = write(outfd, bufp, inc);
-				if (outc < 0)
+				if (outc < 0) {
 					if (errno == EINTR || errno == EAGAIN) {
 						continue;
+					}
 					goto copy_done;
+				}
 				inc -= outc;
 				bufp += outc;
+			}
 			if (hash_interval) {
 				while (bytes >= hashc) {
 					(void)putc('#', ttyout);
 					hashc += hash_interval;
+				}
 				(void)fflush(ttyout);
+			}
+		}
 		if (rate_limit) {	/* rate limited; wait if necessary */
 			while (1) {

 @@ -1,17 +1,17 @@
-/*	$NetBSD: progressbar.c,v 1.23 2019/06/22 23:40:33 christos Exp $	*/
+/*	$NetBSD: progressbar.c,v 1.23.2.1 2021/01/29 20:58:19 martin Exp $	*/
 /*-
- * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997-2021 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.
  * 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.
 @@ -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.23 2019/06/22 23:40:33 christos Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.23.2.1 2021/01/29 20:58:19 martin 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>
 @@ -183,27 +183,27 @@ progressmeter(int flag)
 			siglongjmp(toplevel, 1);
+		}
 #endif	/* !STANDALONE_PROGRESS */
+	}
 	/*
 	 * Always set the handler even if we are not the foreground process.
 	 */
 #ifdef STANDALONE_PROGRESS
 	if (progress) {
 #else
 	if (quit_time > 0 || progress) {
 #endif /* !STANDALONE_PROGRESS */
 		if (flag == -1) {
-			(void)xsignal_restart(SIGALRM, updateprogressmeter, 1);
+			(void)xsignal(SIGALRM, updateprogressmeter);
 			alarmtimer(1);		/* set alarm timer for 1 Hz */
 		} else if (flag == 1) {
 			alarmtimer(0);
 			(void)xsignal(SIGALRM, SIG_DFL);
+		}
+	}
 #ifndef NO_PROGRESS
 	if (!progress)
 		return;
 	len = 0;
 	/*
 	 * print progress bar only if we are foreground process.
 @@ -394,83 +394,31 @@ psummary(int notused)
  * Set the SIGALRM interval timer for wait seconds, 0 to disable.
  */
 void
 alarmtimer(int wait)
+{
 	struct itimerval itv;
 	itv.it_value.tv_sec = wait;
 	itv.it_value.tv_usec = 0;
 	itv.it_interval = itv.it_value;
 	setitimer(ITIMER_REAL, &itv, NULL);
+}
 /*
- * Install a POSIX signal handler, allowing the invoker to set whether
+ * Install a non-restartable POSIX signal handler.
  * the signal should be restartable or not
  */
 sigfunc
-xsignal_restart(int sig, sigfunc func, int restartable)
+xsignal(int sig, sigfunc func)
+{
 	struct sigaction act, oact;
 	act.sa_handler = func;
 	sigemptyset(&act.sa_mask);
-#if defined(SA_RESTART)			/* 4.4BSD, Posix(?), SVR4 */
+	act.sa_flags = 0;
-	act.sa_flags = restartable ? SA_RESTART : 0;
+#if defined(SA_INTERRUPT)		/* SunOS 4.x */
-#elif defined(SA_INTERRUPT)		/* SunOS 4.x */
+	act.sa_flags = SA_INTERRUPT;
 	act.sa_flags = restartable ? 0 : SA_INTERRUPT;
 #else
 #error "system must have SA_RESTART or SA_INTERRUPT"
 #endif
 	if (sigaction(sig, &act, &oact) < 0)
 		return (SIG_ERR);
 	return (oact.sa_handler);
+}
 /*
  * Install a signal handler with the `restartable' flag set dependent upon
  * which signal is being set. (This is a wrapper to xsignal_restart())
  */
 sigfunc
 xsignal(int sig, sigfunc func)
 	int restartable;
 	/*
 	 * Some signals print output or change the state of the process.
 	 * There should be restartable, so that reads and writes are
 	 * not affected.  Some signals should cause program flow to change;
 	 * these signals should not be restartable, so that the system call
 	 * will return with EINTR, and the program will go do something
 	 * different.  If the signal handler calls longjmp() or siglongjmp(),
 	 * it doesn't matter if it's restartable.
 	 */
 	switch(sig) {
 #ifdef SIGINFO
 	case SIGINFO:
 #endif
 	case SIGQUIT:
 	case SIGUSR1:
 	case SIGUSR2:
 	case SIGWINCH:
 		restartable = 1;
 		break;
 	case SIGALRM:
 	case SIGINT:
 	case SIGPIPE:
 		restartable = 0;
 		break;
 	default:
 		/*
 		 * 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);
 	return(xsignal_restart(sig, func, restartable));

 @@ -1,17 +1,17 @@
-/*	$NetBSD: progressbar.h,v 1.8 2009/04/12 10:18:52 lukem Exp $	*/
+/*	$NetBSD: progressbar.h,v 1.8.48.1 2021/01/29 20:58:19 martin Exp $	*/
 /*-
- * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996-2021 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.
  * 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.
 @@ -58,27 +58,26 @@ GLOBAL	char   *prefix;		/* Text written
 GLOBAL	int	fromatty;	/* input is from a terminal */
 GLOBAL	int	verbose;	/* print messages coming back from server */
 GLOBAL	int	quit_time;	/* maximum time to wait if stalled */
 GLOBAL	const char  *direction;	/* direction transfer is occurring */
 GLOBAL	sigjmp_buf toplevel;	/* non-local goto stuff for cmd scanner */
 #endif	/* !STANDALONE_PROGRESS */
 int	foregroundproc(void);
 void	alarmtimer(int);
 void	progressmeter(int);
 sigfunc	xsignal(int, sigfunc);
 sigfunc	xsignal_restart(int, sigfunc, int);
 #ifndef STANDALONE_PROGRESS
 void	psummary(int);
 void	ptransfer(int);
 #endif	/* !STANDALONE_PROGRESS */
 #ifdef NO_LONG_LONG
 # define LLF		"%ld"
 # define LLFP(x)	"%" x "ld"
 # define LLT		long
 # define ULLF		"%lu"
 # define ULLFP(x)	"%" x "lu"
 # define ULLT		unsigned long

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ssl.c,v 1.8 2019/04/07 00:44:54 christos Exp $	*/
+/*	$NetBSD: ssl.c,v 1.8.2.1 2021/01/29 20:58:19 martin Exp $	*/
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2008, 2010 Joerg Sonnenberger <joerg@NetBSD.org>
  * Copyright (c) 2015 Thomas Klausner <wiz@NetBSD.org>
  * All rights reserved.
+ *
  * 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
  *    in this position and unchanged.
 @@ -24,27 +24,27 @@
  * IN NO EVENT SHALL THE AUTHOR 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.
+ *
  * $FreeBSD: common.c,v 1.53 2007/12/19 00:26:36 des Exp $
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ssl.c,v 1.8 2019/04/07 00:44:54 christos Exp $");
+__RCSID("$NetBSD: ssl.c,v 1.8.2.1 2021/01/29 20:58:19 martin Exp $");
 #endif
 #include <time.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/param.h>
 #include <sys/select.h>
 #include <sys/uio.h>
 #include <netinet/tcp.h>
 #include <netinet/in.h>
 @@ -346,26 +346,30 @@ fetch_cache_data(struct fetch_connect *c
 static int
 fetch_wait(struct fetch_connect *conn, ssize_t rlen, struct timeval *timeout)
+{
 	struct timeval now, delta;
 	int fd = conn->sd;
 	fd_set fds;
 	FD_ZERO(&fds);
 	while (!FD_ISSET(fd, &fds)) {
 		FD_SET(fd, &fds);
 		if (quit_time > 0) {
 			gettimeofday(&now, NULL);
 			if (!timercmp(timeout, &now, >)) {
 				fprintf(ttyout, "\r\n%s: transfer aborted"
 				    " because stalled for %lu sec.\r\n",
 				    getprogname(), (unsigned long)quit_time);
 				errno = ETIMEDOUT;
 				conn->iserr = ETIMEDOUT;
 				return -1;
+			}
 			timersub(timeout, &now, &delta);
+		}
 		errno = 0;
 		if (select(fd + 1,
 			rlen == FETCH_READ_WAIT ? &fds : NULL,
 			rlen == FETCH_WRITE_WAIT ? &fds : NULL,
 			NULL, quit_time > 0 ? &delta : NULL) < 0) {
 			if (errno == EINTR)
 				continue;
 			conn->iserr = errno;

 @@ -1,17 +1,17 @@
-/*	$NetBSD: version.h,v 1.87 2015/09/12 20:18:52 wiz Exp $	*/
+/*	$NetBSD: version.h,v 1.87.18.1 2021/01/29 20:58:19 martin Exp $	*/
 /*-
- * Copyright (c) 1999-2015 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999-2021 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.
  * 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.
 @@ -24,15 +24,15 @@
  * 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.
  */
 #ifndef FTP_PRODUCT
 #define	FTP_PRODUCT	"NetBSD-ftp"
 #endif
 #ifndef FTP_VERSION
-#define	FTP_VERSION	"20150912"
+#define	FTP_VERSION	"20210106"
 #endif