 @@ -1,14 +1,14 @@
-/*	$NetBSD: fetch.c,v 1.228 2017/02/15 11:52:11 nonaka Exp $	*/
+/*	$NetBSD: fetch.c,v 1.229 2017/11/25 15:39:17 christos Exp $	*/
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Scott Aaron Bamford.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Thomas Klausner.
 @@ -27,27 +27,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: fetch.c,v 1.228 2017/02/15 11:52:11 nonaka Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.229 2017/11/25 15:39:17 christos Exp $");
 #endif /* not lint */
 /*
  * FTP User Program -- Command line file retrieval
  */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 @@ -2087,34 +2087,35 @@ fetch_ftp(const char *url)
 	if (dirhasglob || filehasglob) {
 		int ointeractive;
 		ointeractive = interactive;
 		interactive = 0;
 		if (restartautofetch)
 			(void)strlcpy(cmdbuf, "mreget", sizeof(cmdbuf));
 		else
 			(void)strlcpy(cmdbuf, "mget", sizeof(cmdbuf));
 		xargv[0] = cmdbuf;
 		mget(xargc, xargv);
 		interactive = ointeractive;
 	} else {
-		if (outfile == NULL) {
+		char *destfile = outfile;
 		if (destfile == NULL) {
 			cp = strrchr(file, '/');	/* find savefile */
 			if (cp != NULL)
-				outfile = cp + 1;
+				destfile = cp + 1;
 			else
-				outfile = file;
+				destfile = file;
+		}
-		xargv[2] = (char *)outfile;
+		xargv[2] = (char *)destfile;
 		xargv[3] = NULL;
 		xargc++;
 		if (restartautofetch)
 			reget(xargc, xargv);
 		else
 			get(xargc, xargv);
+	}
 	if ((code / 100) == COMPLETE)
 		rval = 0;
  cleanup_fetch_ftp:
 	freeurlinfo(&ui);
 @@ -2240,28 +2241,29 @@ auto_fetch(int argc, char *argv[])
 	(void)xsignal(SIGPIPE, lostpeer);
 	/*
 	 * Loop through as long as there's files to fetch.
 	 */
 	for (; (rval == 0) && (argpos < argc); argpos++) {
 		if (strchr(argv[argpos], ':') == NULL)
 			break;
 		redirect_loop = 0;
 		if (!anonftp)
 			anonftp = 2;	/* Handle "automatic" transfers. */
 		rval = go_fetch(argv[argpos]);
 		if (outfile != NULL && strcmp(outfile, "-") != 0
-		    && outfile[0] != '|')
+		    && outfile[0] != '|') {
-			outfile = NULL;
+			FREEPTR(outfile);
+		}
 		if (rval > 0)
 			rval = argpos + 1;
+	}
 	if (connected && rval != -1)
 		disconnect(0, NULL);
 	return (rval);
+}
 /*
  * Upload multiple files from the command line.
+ *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.123 2015/04/23 23:31:23 lukem Exp $	*/
+/*	$NetBSD: main.c,v 1.124 2017/11/25 15:39:17 christos Exp $	*/
 /*-
  * Copyright (c) 1996-2015 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.
 @@ -88,27 +88,27 @@
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\
  The Regents of the University of California.  All rights reserved.\
   Copyright 1996-2015 The NetBSD Foundation, Inc.  All rights reserved");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.123 2015/04/23 23:31:23 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.124 2017/11/25 15:39:17 christos Exp $");
 #endif
 #endif /* not lint */
 /*
  * FTP User Program -- Command Interface.
  */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <err.h>
 #include <errno.h>
 #include <netdb.h>
 #include <paths.h>
 @@ -314,27 +314,27 @@ main(int volatile argc, char **volatile
 		case 'n':
 			autologin = 0;
 			break;
 		case 'N':
 			if (strlcpy(netrc, optarg, sizeof(netrc))
 			    >= sizeof(netrc))
 				errx(1, "%s: %s", optarg,
 				    strerror(ENAMETOOLONG));
 			break;
 		case 'o':
-			outfile = optarg;
+			outfile = ftp_strdup(optarg);
 			if (strcmp(outfile, "-") == 0)
 				ttyout = stderr;
 			break;
 		case 'p':
 			passivemode = 1;
 			activefallback = 0;
 			break;
 		case 'P':
 			ftpport = optarg;
 			break;