 @@ -1,14 +1,14 @@
-/*	$NetBSD: cmds.c,v 1.137 2016/02/27 16:31:31 christos Exp $	*/
+/*	$NetBSD: cmds.c,v 1.138 2017/11/20 21:11:36 kre Exp $	*/
 /*-
  * Copyright (c) 1996-2009 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 Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -86,27 +86,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[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$NetBSD: cmds.c,v 1.137 2016/02/27 16:31:31 christos Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.138 2017/11/20 21:11:36 kre Exp $");
 #endif
 #endif /* not lint */
 /*
  * FTP User Program -- Command Routines.
  */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <arpa/ftp.h>
 #include <ctype.h>
 @@ -1148,27 +1148,28 @@ cd(int argc, char *argv[])
 		UPRINTF("usage: %s remote-directory\n", argv[0]);
 		code = -1;
 		return;
+	}
 	r = command("CWD %s", argv[1]);
 	if (r == ERROR && code == 500) {
 		if (verbose)
 			fputs("CWD command not recognized, trying XCWD.\n",
 			    ttyout);
 		r = command("XCWD %s", argv[1]);
+	}
 	if (r == COMPLETE) {
 		dirchange = 1;
-		updateremotecwd();
+		remotecwd[0] = '\0';
 		remcwdvalid = 0;
+	}
+}
 /*
  * Set current working directory on local machine.
  */
 void
 lcd(int argc, char *argv[])
+{
 	char *locdir;
 	code = -1;
 	if (argc == 1) {
 @@ -1534,29 +1535,29 @@ user(int argc, char *argv[])
 /*
  * Print working directory on remote machine.
  */
 /*VARARGS*/
 void
 pwd(int argc, char *argv[])
+{
 	code = -1;
 	if (argc != 1) {
 		UPRINTF("usage: %s\n", argv[0]);
 		return;
+	}
-	if (! remotecwd[0])
+	if (!remcwdvalid || remotecwd[0] == '\0')
 		updateremotecwd();
-	if (! remotecwd[0])
+	if (remotecwd[0] == '\0')
 		fprintf(ttyout, "Unable to determine remote directory\n");
 	else {
 		fprintf(ttyout, "Remote directory: %s\n", remotecwd);
 		code = 0;
+	}
+}
 /*
  * Print working directory on local machine.
  */
 void
 lpwd(int argc, char *argv[])
+{
 @@ -2349,27 +2350,28 @@ cdup(int argc, char *argv[])
 		UPRINTF("usage: %s\n", argv[0]);
 		code = -1;
 		return;
+	}
 	r = command("CDUP");
 	if (r == ERROR && code == 500) {
 		if (verbose)
 			fputs("CDUP command not recognized, trying XCUP.\n",
 			    ttyout);
 		r = command("XCUP");
+	}
 	if (r == COMPLETE) {
 		dirchange = 1;
-		updateremotecwd();
+		remotecwd[0] = '\0';
 		remcwdvalid = 0;
+	}
+}
 /*
  * Restart transfer at specific point
  */
 void
 restart(int argc, char *argv[])
+{
 	if (argc == 0 || argc > 2) {
 		UPRINTF("usage: %s [restart-point]\n", argv[0]);
 		code = -1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ftp_var.h,v 1.84 2015/12/16 23:00:39 christos Exp $	*/
+/*	$NetBSD: ftp_var.h,v 1.85 2017/11/20 21:11:36 kre Exp $	*/
 /*-
  * Copyright (c) 1996-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.
 @@ -259,26 +259,27 @@ GLOBAL	int	features[FEAT_max];	/* remote
 #ifndef NO_EDITCOMPLETE
 GLOBAL	EditLine *el;		/* editline(3) status structure */
 GLOBAL	History  *hist;		/* editline(3) history structure */
 GLOBAL	char	 *cursor_pos;	/* cursor position we're looking for */
 GLOBAL	size_t	  cursor_argc;	/* location of cursor in margv */
 GLOBAL	size_t	  cursor_argo;	/* offset of cursor in margv[cursor_argc] */
 #endif /* !NO_EDITCOMPLETE */
 GLOBAL	char   *hostname;	/* name of host connected to */
 GLOBAL	int	unix_server;	/* server is unix, can use binary for ascii */
 GLOBAL	int	unix_proxy;	/* proxy is unix, can use binary for ascii */
 GLOBAL	char	localcwd[MAXPATHLEN];	/* local dir */
 GLOBAL	char	remotecwd[MAXPATHLEN];	/* remote dir */
 GLOBAL	int	remcwdvalid;		/* remotecwd has been updated */
 GLOBAL	char   *username;	/* name of user logged in as. (dynamic) */
 GLOBAL	sa_family_t family;	/* address family to use for connections */
 GLOBAL	const char *ftpport;	/* port number to use for FTP connections */
 GLOBAL	const char *httpport;	/* port number to use for HTTP connections */
 #ifdef WITH_SSL
 GLOBAL	const char *httpsport;	/* port number to use for HTTPS connections */
 #endif
 GLOBAL	const char *gateport;	/* port number to use for gateftp connections */
 GLOBAL	struct addrinfo *bindai; /* local address to bind as */
 GLOBAL	char   *outfile;	/* filename to output URLs to */
 GLOBAL	int	restartautofetch; /* restart auto-fetch */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: util.c,v 1.158 2013/02/19 23:29:15 dsl Exp $	*/
+/*	$NetBSD: util.c,v 1.159 2017/11/20 21:11:36 kre 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.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -54,27 +54,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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: util.c,v 1.158 2013/02/19 23:29:15 dsl Exp $");
+__RCSID("$NetBSD: util.c,v 1.159 2017/11/20 21:11:36 kre Exp $");
 #endif /* not lint */
 /*
  * FTP User Program -- Misc support routines
  */
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/ftp.h>
 #include <ctype.h>
 @@ -468,27 +468,28 @@ ftp_login(const char *host, const char *
 		goto cleanup_ftp_login;
 	connected = -1;
 	getremoteinfo();
 	for (n = 0; n < macnum; ++n) {
 		if (!strcmp("init", macros[n].mac_name)) {
 			(void)strlcpy(line, "$init", sizeof(line));
 			makeargv();
 			domacro(margc, margv);
 			break;
+		}
+	}
 	updatelocalcwd();
-	updateremotecwd();
+	remotecwd[0] = '\0';
 	remcwdvalid = 0;
  cleanup_ftp_login:
 	FREEPTR(fuser);
 	if (pass != NULL)
 		memset(pass, 0, strlen(pass));
 	FREEPTR(pass);
 	if (facct != NULL)
 		memset(facct, 0, strlen(facct));
 	FREEPTR(facct);
 	return (rval);
+}
 /*
 @@ -825,26 +826,27 @@ updatelocalcwd(void)
 	DPRINTF("updatelocalcwd: got `%s'\n", localcwd);
+}
 /*
  * Update global `remotecwd', which contains the state of the remote cwd
  */
 void
 updateremotecwd(void)
+{
 	int	 overbose, ocode;
 	size_t	 i;
 	char	*cp;
 	remcwdvalid = 1;	/* whether it works or not, we are done */
 	overbose = verbose;
 	ocode = code;
 	if (ftp_debug == 0)
 		verbose = -1;
 	if (command("PWD") != COMPLETE)
 		goto badremotecwd;
 	cp = strchr(reply_string, ' ');
 	if (cp == NULL || cp[0] == '\0' || cp[1] != '"')
 		goto badremotecwd;
 	cp += 2;
 	for (i = 0; *cp && i < sizeof(remotecwd) - 1; i++, cp++) {
 		if (cp[0] == '"') {
 			if (cp[1] == '"')
 @@ -1164,26 +1166,28 @@ formatbuf(char *buf, size_t len, const c
 	p = src;
 	for (i = 0; *p; p++) {
 		if (*p != '%') {
 			ADDBUF(*p);
 			continue;
+		}
 		p++;
 		switch (op = *p) {
 		case '/':
 		case '.':
 		case 'c':
 			if (connected && !remcwdvalid)
 				updateremotecwd();
 			p2 = connected ? remotecwd : "";
 			updirs = pdirs = 0;
 			/* option to determine fixed # of dirs from path */
 			if (op == '.' || op == 'c') {
 				int skip;
 				q = p2;
 				while (*p2)		/* calc # of /'s */
 					if (*p2++ == '/')
 						updirs++;
 				if (p[1] == '0') {	/* print <x> or ... */
 					pdirs = 1;