 @@ -1,14 +1,14 @@
-/*	$NetBSD: eval.c,v 1.140.2.5 2018/08/25 14:22:49 martin Exp $	*/
+/*	$NetBSD: eval.c,v 1.140.2.6 2018/08/25 14:48:22 martin Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
+ *
  * 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.
 @@ -27,27 +27,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[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.140.2.5 2018/08/25 14:22:49 martin Exp $");
+__RCSID("$NetBSD: eval.c,v 1.140.2.6 2018/08/25 14:48:22 martin Exp $");
 #endif
 #endif /* not lint */
 #include <stdbool.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
 #include <unistd.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 @@ -686,27 +686,27 @@ evalbackcmd(union node *n, struct backcm
 			/* NOTREACHED */
+		}
 		close(pip[1]);
 		result->fd = pip[0];
 		result->jp = jp;
 		INTON;
+	}
  out:
 	popstackmark(&smark);
 	CTRACE(DBG_EVAL, ("evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
 		result->fd, result->buf, result->nleft, result->jp));
+}
-static const char *
+const char *
 syspath(void)
+{
 	static char *sys_path = NULL;
 	static int mib[] = {CTL_USER, USER_CS_PATH};
 	static char def_path[] = "PATH=/usr/bin:/bin:/usr/sbin:/sbin";
 	size_t len;
 	if (sys_path == NULL) {
 		if (sysctl(mib, 2, 0, &len, 0, 0) != -1 &&
 		    (sys_path = ckmalloc(len + 5)) != NULL &&
 		    sysctl(mib, 2, sys_path + 5, &len, 0, 0) != -1) {
 			memcpy(sys_path, "PATH=", 5);
 		} else {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: eval.h,v 1.19.8.1 2018/08/25 14:22:49 martin Exp $	*/
+/*	$NetBSD: eval.h,v 1.19.8.2 2018/08/25 14:48:22 martin Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
+ *
  * 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.
 @@ -42,26 +42,28 @@ extern struct strlist *cmdenviron;  /* e
 struct backcmd {		/* result of evalbackcmd */
 	int fd;			/* file descriptor to read from */
 	char *buf;		/* buffer */
 	int nleft;		/* number of chars in buffer */
 	struct job *jp;		/* job structure for command */
 };
 void evalstring(char *, int);
 union node;	/* BLETCH for ansi C */
 void evaltree(union node *, int);
 void evalbackcmd(union node *, struct backcmd *);
 const char *syspath(void);
 /* in_function returns nonzero if we are currently evaluating a function */
 int in_function(void);		/* return non-zero, if evaluating a function */
 /* reasons for skipping commands (see comment on breakcmd routine) */
 enum skipstate {
       SKIPNONE  = 0,	/* not skipping */
       SKIPBREAK,	/* break */
       SKIPCONT,		/* continue */
       SKIPFUNC,		/* return in a function */
       SKIPFILE		/* return in a dot command */
 };
 enum skipstate current_skipstate(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec.c,v 1.47.2.3 2018/07/13 14:29:15 martin Exp $	*/
+/*	$NetBSD: exec.c,v 1.47.2.4 2018/08/25 14:48:22 martin Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
+ *
  * 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.
 @@ -27,27 +27,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[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: exec.c,v 1.47.2.3 2018/07/13 14:29:15 martin Exp $");
+__RCSID("$NetBSD: exec.c,v 1.47.2.4 2018/08/25 14:48:22 martin Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 /*
 @@ -1054,68 +1054,90 @@ typecmd(int argc, char **argv)
 	int c;
 	int V_flag = 0;
 	int v_flag = 0;
 	int p_flag = 0;
 	while ((c = nextopt("vVp")) != 0) {
 		switch (c) {
 		case 'v': v_flag = 1; break;
 		case 'V': V_flag = 1; break;
 		case 'p': p_flag = 1; break;
+		}
+	}
-	if (p_flag && (v_flag || V_flag))
+	if (argv[0][0] != 'c' && v_flag | V_flag | p_flag)
-		error("cannot specify -p with -v or -V");
+		error("usage: %s name...", argv[0]);
 	if (v_flag && V_flag)
 		error("-v and -V cannot both be specified");
 	if (*argptr == NULL)
 		error("usage: %s%s name ...", argv[0],
 		    argv[0][0] == 'c' ? " [-p] [-v|-V]" : "");
 	while ((arg = *argptr++)) {
 		if (!v_flag)
 			out1str(arg);
 		/* First look at the keywords */
 		for (pp = parsekwd; *pp; pp++)
 			if (**pp == *arg && equal(*pp, arg))
 				break;
 		if (*pp) {
 			if (v_flag)
-				err = 1;
+				out1fmt("%s\n", arg);
 			else
 				out1str(" is a shell keyword\n");
 			continue;
+		}
 		/* Then look at the aliases */
 		if ((ap = lookupalias(arg, 1)) != NULL) {
-			if (!v_flag)
+			int ml = 0;
 				out1fmt(" is an alias for \n");
 			if (!v_flag) {
 				out1str(" is an alias ");
 				if (strchr(ap->val, '\n')) {
 					out1str("(multiline)...\n");
 					ml = 1;
 				} else
 					out1str("for: ");
+			}
 			out1fmt("%s\n", ap->val);
 			if (ml && *argptr != NULL)
 				out1c('\n');
 			continue;
+		}
 		/* Then check if it is a tracked alias */
-		if ((cmdp = cmdlookup(arg, 0)) != NULL) {
+		if (!p_flag && (cmdp = cmdlookup(arg, 0)) != NULL) {
 			entry.cmdtype = cmdp->cmdtype;
 			entry.u = cmdp->param;
 		} else {
 			cmdp = NULL;
 			/* Finally use brute force */
-			find_command(arg, &entry, DO_ABS, pathval());
+			find_command(arg, &entry, DO_ABS,
 			     p_flag ? syspath() + 5 : pathval());
+		}
 		switch (entry.cmdtype) {
 		case CMDNORMAL: {
 			if (strchr(arg, '/') == NULL) {
-				const char *path = pathval();
+				const char *path;
 				char *name;
 				int j = entry.u.index;
 				path = p_flag ? syspath() + 5 : pathval();
 				do {
 					name = padvance(&path, arg, 1);
 					stunalloc(name);
 				} while (--j >= 0);
 				if (!v_flag)
 					out1fmt(" is%s ",
 					    cmdp ? " a tracked alias for" : "");
 				out1fmt("%s\n", name);
 			} else {
 				if (access(arg, X_OK) == 0) {
 					if (!v_flag)
 						out1fmt(" is ");
 					out1fmt("%s\n", arg);