 @@ -1,14 +1,14 @@
-/*	$NetBSD: expand.c,v 1.100 2016/03/31 13:27:44 christos Exp $	*/
+/*	$NetBSD: expand.c,v 1.101 2016/03/31 16:16:35 christos 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[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #else
-__RCSID("$NetBSD: expand.c,v 1.100 2016/03/31 13:27:44 christos Exp $");
+__RCSID("$NetBSD: expand.c,v 1.101 2016/03/31 16:16:35 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 @@ -897,27 +897,27 @@ varvalue(char *name, int quoted, int sub
 		goto numvar;
 	case '?':
 		num = exitstatus;
 		goto numvar;
 	case '#':
 		num = shellparam.nparam;
 		goto numvar;
 	case '!':
 		num = backgndpid;
 numvar:
 		expdest = cvtnum(num, expdest);
 		break;
 	case '-':
-		for (i = 0; optlist[i].name; i++) {
+		for (i = 0; optlist[i].name || optlist[i].letter; i++) {
 			if (optlist[i].val && optlist[i].letter)
 				STPUTC(optlist[i].letter, expdest);
+		}
 		break;
 	case '@':
 		if (flag & EXP_FULL && quoted) {
 			for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
 				STRTODEST(p);
 				if (*ap)
 					/* A NUL separates args inside "" */
 					STPUTC('\0', expdest);
+			}
 			break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.63 2016/03/27 14:34:46 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.64 2016/03/31 16:16:35 christos 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.
 @@ -32,27 +32,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1991, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.7 (Berkeley) 7/19/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.63 2016/03/27 14:34:46 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.64 2016/03/31 16:16:35 christos Exp $");
 #endif
 #endif /* not lint */
 #include <errno.h>
 #include <stdio.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <locale.h>
 #include <fcntl.h>
 @@ -72,27 +72,26 @@ __RCSID("$NetBSD: main.c,v 1.63 2016/03/
 #include "var.h"
 #include "show.h"
 #include "memalloc.h"
 #include "error.h"
 #include "init.h"
 #include "mystring.h"
 #include "exec.h"
 #include "cd.h"
 #define PROFILE 0
 int rootpid;
 int rootshell;
 int posix;
 #if PROFILE
 short profile_buf[16384];
 extern int etext();
 #endif
 STATIC void read_profile(const char *);
 int main(int, char **);
 /*
  * Main routine.  We initialize things, parse the arguments, execute
  * profiles if we're a login shell, and then call cmdloop to execute
  * commands.  The setjmp call sets up the location to jump to when an
  * exception occurs.  When an exception occurs the variable "state"

 @@ -1,14 +1,14 @@
-/*	$NetBSD: options.c,v 1.45 2016/03/08 14:08:39 christos Exp $	*/
+/*	$NetBSD: options.c,v 1.46 2016/03/31 16:16:35 christos 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[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: options.c,v 1.45 2016/03/08 14:08:39 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.46 2016/03/31 16:16:35 christos Exp $");
 #endif
 #endif /* not lint */
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include "shell.h"
 #define DEFINE_OPTIONS
 #include "options.h"
 #undef DEFINE_OPTIONS
 #include "builtins.h"
 #include "nodes.h"	/* for other header files */
 @@ -214,45 +214,60 @@ set_opt_val(size_t i, int val)
 			optlist[j].val = 0;
+	}
 	optlist[i].val = val;
 #ifdef DEBUG
 	if (&optlist[i].val == &debug)
 		opentrace();
 #endif
+}
 STATIC void
 minus_o(char *name, int val)
+{
 	size_t i;
 	const char *sep = ": ";
 	if (name == NULL) {
 		if (val) {
-			out1str("Current option settings\n");
+			out1str("Current option settings");
 			for (i = 0; i < NOPTS; i++) {
-				out1fmt("%-16s%s\n", optlist[i].name,
+				if (optlist[i].name == NULL)  {
 					out1fmt("%s%c%c", sep,
 					    "+-"[optlist[i].val],
 					    optlist[i].letter);
 					sep = ", ";
+				}
+			}
 			out1c('\n');
 			for (i = 0; i < NOPTS; i++) {
 				if (optlist[i].name)
 				    out1fmt("%-16s%s\n", optlist[i].name,
 					optlist[i].val ? "on" : "off");
+			}
 		} else {
 			out1str("set");
 			for (i = 0; i < NOPTS; i++) {
-				out1fmt(" %co %s",
+				if (optlist[i].name)
 				    out1fmt(" %co %s",
 					"+-"[optlist[i].val], optlist[i].name);
 				else
 				    out1fmt(" %c%c", "+-"[optlist[i].val],
 					optlist[i].letter);
+			}
-			out1str("\n");
+			out1c('\n');
+		}
 	} else {
 		for (i = 0; i < NOPTS; i++)
-			if (equal(name, optlist[i].name)) {
+			if (optlist[i].name && equal(name, optlist[i].name)) {
 				set_opt_val(i, val);
 				return;
+			}
 		error("Illegal option -o %s", name);
+	}
+}
 STATIC void
 setoption(int flag, int val)
+{
 	size_t i;
 @@ -356,27 +371,27 @@ shiftcmd(int argc, char **argv)
 	return 0;
+}
 /*
  * The set command builtin.
  */
 int
 setcmd(int argc, char **argv)
+{
 	if (argc == 1)
-		return showvars(0, 0, 1);
+		return showvars(0, 0, 1, 0);
 	INTOFF;
 	options(0);
 	optschanged();
 	if (*argptr != NULL) {
 		setparam(argptr);
+	}
 	INTON;
 	return 0;
+}
 void
 getoptsreset(const char *value)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: options.h,v 1.24 2016/02/23 18:30:16 christos Exp $	*/
+/*	$NetBSD: options.h,v 1.25 2016/03/31 16:16:35 christos 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.
 @@ -95,29 +95,31 @@ DEF_OPT( "quietprofile", 'q' )
 #define	qflag optlist[15].val
 DEF_OPT( "nolog",	0 )	/* [U] no functon defs in command history */
 #define	nolog optlist[16].val
 DEF_OPT( "cdprint",	0 )	/* always print result of cd */
 #define	cdprint optlist[17].val
 DEF_OPT( "tabcomplete",	0 )	/* <tab> causes filename expansion */
 #define	tabcomplete optlist[18].val
 DEF_OPT( "fork",	'F' )	/* use fork(2) instead of vfork(2) */
 #define	usefork optlist[19].val
 DEF_OPT( "nopriv",	'p' )	/* preserve privs even if set{u,g}id */
 #define	pflag optlist[20].val
 DEF_OPT( "trackall",	'h' )	/* [U] locate cmds in funcs when defined */
 #define	hflag optlist[21].val
 DEF_OPT( "posix",	0  )	/* operate in posix mode */
 #define	posix optlist[22].val
 #ifdef DEBUG
 DEF_OPT( "debug",	0 )	/* enable debug prints */
-#define	debug optlist[22].val
+#define	debug optlist[23].val
 #endif
 #ifdef DEFINE_OPTIONS
 	{ 0, 0, 0, 0 },
 };
 #define NOPTS (sizeof optlist / sizeof optlist[0] - 1)
 int sizeof_optlist = sizeof optlist;
 #else
 extern struct optent optlist[];
 extern int sizeof_optlist;
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.48 2016/03/27 14:34:46 christos Exp $	*/
+/*	$NetBSD: var.c,v 1.49 2016/03/31 16:16:35 christos 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[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: var.c,v 1.48 2016/03/27 14:34:46 christos Exp $");
+__RCSID("$NetBSD: var.c,v 1.49 2016/03/31 16:16:35 christos Exp $");
 #endif
 #endif /* not lint */
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <paths.h>
 #include <limits.h>
 /*
  * Shell variables.
  */
 @@ -88,41 +88,44 @@ struct varinit {
 struct localvar *localvars;
 #ifndef SMALL
 struct var vhistsize;
 struct var vterm;
 #endif
 struct var vifs;
 struct var vmail;
 struct var vmpath;
 struct var vpath;
 struct var vps1;
 struct var vps2;
 struct var vps4;
 struct var vvers;
 struct var voptind;
 char ifs_default[] = " \t\n";
 const struct varinit varinit[] = {
 #ifndef SMALL
 	{ &vhistsize,	VSTRFIXED|VTEXTFIXED|VUNSET,	"HISTSIZE=",
 	  sethistsize },
 #endif
 	{ &vifs,	VSTRFIXED|VTEXTFIXED,		"IFS= \t\n",
 	  NULL },
 	{ &vmail,	VSTRFIXED|VTEXTFIXED|VUNSET,	"MAIL=",
 	  NULL },
 	{ &vmpath,	VSTRFIXED|VTEXTFIXED|VUNSET,	"MAILPATH=",
 	  NULL },
 	{ &vvers,	VSTRFIXED|VTEXTFIXED|VNOEXPORT, "NETBSD_SHELL=",
 	  NULL },
 	{ &vpath,	VSTRFIXED|VTEXTFIXED,		"PATH=" _PATH_DEFPATH,
 	  changepath },
 	/*
 	 * vps1 depends on uid
 	 */
 	{ &vps2,	VSTRFIXED|VTEXTFIXED,		"PS2=> ",
 	  NULL },
 	{ &vps4,	VSTRFIXED|VTEXTFIXED,		"PS4=+ ",
 	  NULL },
 #ifndef SMALL
 	{ &vterm,	VSTRFIXED|VTEXTFIXED|VUNSET,	"TERM=",
 	  setterm },
 #endif
 @@ -135,46 +138,48 @@ const struct varinit varinit[] = {
 struct var *vartab[VTABSIZE];
 STATIC int strequal(const char *, const char *);
 STATIC struct var *find_var(const char *, struct var ***, int *);
 /*
  * Initialize the varable symbol tables and import the environment
  */
 #ifdef mkinit
 INCLUDE <stdio.h>
 INCLUDE <unistd.h>
 INCLUDE "var.h"
 INCLUDE "version.h"
 MKINIT char **environ;
 INIT {
 	char **envp;
 	char buf[64];
 	initvar();
 	for (envp = environ ; *envp ; envp++) {
 		if (strchr(*envp, '=')) {
 			setvareq(*envp, VEXPORT|VTEXTFIXED);
+		}
+	}
 	/*
 	 * PPID is readonly
 	 *	set after processing environ to override anything there
 	 * Always default IFS, ignore any value from environment.
 	 */
 	snprintf(buf, sizeof(buf), "%d", (int)getppid());
 	setvar("PPID", buf, VREADONLY);
 	setvar("IFS", ifs_default, VTEXTFIXED);
 	setvar("NETBSD_SHELL", NETBSD_SHELL, VTEXTFIXED|VREADONLY|VNOEXPORT);
+}
 #endif
 /*
  * This routine initializes the builtin variables.  It is called when the
  * shell is initialized and again when a shell procedure is spawned.
  */
 void
 initvar(void)
+{
 	const struct varinit *ip;
 @@ -284,43 +289,45 @@ setvar(const char *name, const char *val
 /*
  * Same as setvar except that the variable and value are passed in
  * the first argument as name=value.  Since the first argument will
  * be actually stored in the table, it should not be a string that
  * will go away.
  */
 void
 setvareq(char *s, int flags)
+{
 	struct var *vp, **vpp;
 	int nlen;
-	if (aflag)
+	if (aflag && !(flags & VNOEXPORT))
 		flags |= VEXPORT;
 	vp = find_var(s, &vpp, &nlen);
 	if (vp != NULL) {
 		if (vp->flags & VREADONLY)
 			error("%.*s: is read only", vp->name_len, s);
 		if (flags & VNOSET)
 			return;
 		INTOFF;
 		if (vp->func && (flags & VNOFUNC) == 0)
 			(*vp->func)(s + vp->name_len + 1);
 		if ((vp->flags & (VTEXTFIXED|VSTACK)) == 0)
 			ckfree(vp->text);
 		vp->flags &= ~(VTEXTFIXED|VSTACK|VUNSET);
 		if (flags & VNOEXPORT)
 			vp->flags &= ~VEXPORT;
 		vp->flags |= flags & ~VNOFUNC;
 		vp->text = s;
 		/*
 		 * We could roll this to a function, to handle it as
 		 * a regular variable function callback, but why bother?
 		 */
 		if (vp == &vmpath || (vp == &vmail && ! mpathset()))
 			chkmail(1);
 		INTON;
 		return;
+	}
 	/* not found */
 @@ -519,27 +526,27 @@ sort_var(const void *v_v1, const void *v
 	/* XXX Will anyone notice we include the '=' of the shorter name? */
 	return strcoll((*v1)->text, (*v2)->text);
+}
 /*
  * POSIX requires that 'set' (but not export or readonly) output the
  * variables in lexicographic order - by the locale's collating order (sigh).
  * Maybe we could keep them in an ordered balanced binary tree
  * instead of hashed lists.
  * For now just roll 'em through qsort for printing...
  */
 int
-showvars(const char *name, int flag, int show_value)
+showvars(const char *name, int flag, int show_value, const char *xtra)
+{
 	struct var **vpp;
 	struct var *vp;
 	const char *p;
 	static struct var **list;	/* static in case we are interrupted */
 	static int list_len;
 	int count = 0;
 	if (!list) {
 		list_len = 32;
 		list = ckmalloc(list_len * sizeof *list);
+	}
 @@ -555,71 +562,114 @@ showvars(const char *name, int flag, int
 					(list_len << 1) * sizeof *list);
 				list_len <<= 1;
+			}
 			list[count++] = vp;
+		}
+	}
 	qsort(list, count, sizeof *list, sort_var);
 	for (vpp = list; count--; vpp++) {
 		vp = *vpp;
 		if (name)
 			out1fmt("%s ", name);
 		if (xtra)
 			out1fmt("%s ", xtra);
 		for (p = vp->text ; *p != '=' ; p++)
 			out1c(*p);
 		if (!(vp->flags & VUNSET) && show_value) {
 			out1fmt("=");
 			print_quoted(++p);
+		}
 		out1c('\n');
+	}
 	return 0;
+}
 /*
  * The export and readonly commands.
  */
 int
 exportcmd(int argc, char **argv)
+{
 	struct var *vp;
 	char *name;
 	const char *p;
 	int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
-	int pflg;
+	int pflg = 0;
 	int nflg = 0;
 	int xflg = 0;
 	int res;
 	int c;
 	while ((c = nextopt("npx")) != '\0') {
 		switch (c) {
 		case 'p':
 			if (nflg)
 				return 1;
 			pflg = 3;
 			break;
 		case 'n':
 			if (pflg || xflg || flag == VREADONLY)
 				return 1;
 			nflg = 1;
 			break;
 		case 'x':
 			if (nflg || flag == VREADONLY)
 				return 1;
 			flag = VNOEXPORT;
 			xflg = 1;
 			break;
 		default:
 			return 1;
+		}
+	}
-	pflg = nextopt("p") == 'p' ? 3 : 0;
+	if (nflg && *argptr == NULL)
-	if (argc <= 1 || pflg) {
+		return 1;
 		showvars( pflg ? argv[0] : 0, flag, pflg );
 	if (pflg || *argptr == NULL) {
 		showvars( pflg ? argv[0] : 0, flag, pflg,
 		    pflg && xflg ? "-x" : NULL );
 		return 0;
+	}
 	res = 0;
 	while ((name = *argptr++) != NULL) {
 		if ((p = strchr(name, '=')) != NULL) {
 			p++;
 		} else {
 			vp = find_var(name, NULL, NULL);
 			if (vp != NULL) {
-				vp->flags |= flag;
+				if (nflg)
 					vp->flags &= ~flag;
 				else if (flag&VEXPORT && vp->flags&VNOEXPORT)
 					res = 1;
 				else {
 					vp->flags |= flag;
 					if (flag == VNOEXPORT)
 						vp->flags &= ~VEXPORT;
+				}
 				continue;
+			}
+		}
-		setvar(name, p, flag);
+		if (!nflg)
 			setvar(name, p, flag);
+	}
-	return 0;
+	return res;
+}
 /*
  * The "local" command.
  */
 int
 localcmd(int argc, char **argv)
+{
 	char *name;
 	if (! in_function())
 @@ -760,27 +810,27 @@ unsetcmd(int argc, char **argv)
  * Unset the specified variable.
  */
 int
 unsetvar(const char *s, int unexport)
+{
 	struct var **vpp;
 	struct var *vp;
 	vp = find_var(s, &vpp, NULL);
 	if (vp == NULL)
 		return 0;
-	if (vp->flags & VREADONLY)
+	if (vp->flags & VREADONLY && !unexport)
 		return 1;
 	INTOFF;
 	if (unexport) {
 		vp->flags &= ~VEXPORT;
 	} else {
 		if (vp->text[vp->name_len + 1] != '\0')
 			setvar(s, nullstr, 0);
 		vp->flags &= ~VEXPORT;
 		vp->flags |= VUNSET;
 		if ((vp->flags & VSTRFIXED) == 0) {
 			if ((vp->flags & VTEXTFIXED) == 0)
 				ckfree(vp->text);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.h,v 1.27 2016/03/27 14:34:46 christos Exp $	*/
+/*	$NetBSD: var.h,v 1.28 2016/03/31 16:16:35 christos 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.
 @@ -29,34 +29,35 @@
  * 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.
+ *
  *	@(#)var.h	8.2 (Berkeley) 5/4/95
  */
 /*
  * Shell variables.
  */
 /* flags */
-#define VEXPORT		0x01	/* variable is exported */
+#define VEXPORT		0x0001	/* variable is exported */
-#define VREADONLY	0x02	/* variable cannot be modified */
+#define VREADONLY	0x0002	/* variable cannot be modified */
-#define VSTRFIXED	0x04	/* variable struct is statically allocated */
+#define VSTRFIXED	0x0004	/* variable struct is statically allocated */
-#define VTEXTFIXED	0x08	/* text is statically allocated */
+#define VTEXTFIXED	0x0008	/* text is statically allocated */
-#define VSTACK		0x10	/* text is allocated on the stack */
+#define VSTACK		0x0010	/* text is allocated on the stack */
-#define VUNSET		0x20	/* the variable is not set */
+#define VUNSET		0x0020	/* the variable is not set */
-#define VNOFUNC		0x40	/* don't call the callback function */
+#define VNOFUNC		0x0040	/* don't call the callback function */
-#define VNOSET		0x80	/* do not set variable - just readonly test */
+#define VNOSET		0x0080	/* do not set variable - just readonly test */
 #define VNOEXPORT	0x0100	/* variable may not be exported */
 struct var {
 	struct var *next;		/* next entry in hash list */
 	int flags;			/* flags are defined above */
 	char *text;			/* name=value */
 	int name_len;			/* length of name */
 	void (*func)(const char *);
 					/* function to be called when  */
 					/* the variable gets set/unset */
 };
 @@ -105,21 +106,21 @@ extern struct var vhistsize;
 #endif
 #define mpathset()	((vmpath.flags & VUNSET) == 0)
 void initvar(void);
 void setvar(const char *, const char *, int);
 void setvareq(char *, int);
 struct strlist;
 void listsetvar(struct strlist *, int);
 char *lookupvar(const char *);
 char *bltinlookup(const char *, int);
 char **environment(void);
 void shprocvar(void);
-int showvars(const char *, int, int);
+int showvars(const char *, int, int, const char *);
 void mklocal(const char *, int);
 void listmklocal(struct strlist *, int);
 void poplocalvars(void);
 int unsetvar(const char *, int);
 void choose_ps1(void);
 int setvarsafe(const char *, const char *, int);
 void print_quoted(const char *);