 @@ -1,22 +1,22 @@
-/*	$NetBSD: c_ksh.c,v 1.28 2018/05/08 16:37:59 kamil Exp $	*/
+/*	$NetBSD: c_ksh.c,v 1.29 2018/06/03 12:18:29 kamil Exp $	*/
 /*
  * built-in Korn commands: c_*
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: c_ksh.c,v 1.28 2018/05/08 16:37:59 kamil Exp $");
+__RCSID("$NetBSD: c_ksh.c,v 1.29 2018/06/03 12:18:29 kamil Exp $");
 #endif
 #include <sys/stat.h>
 #include <ctype.h>
 #include "sh.h"
 int
 c_cd(wp)
 	char	**wp;
+{
 	int optc;
 	int physical = Flag(FPHYSICAL);
 @@ -1022,27 +1022,27 @@ c_unalias(wp)
 			rv = 1;	/* POSIX */
 			continue;
+		}
 		if (ap->flag&ALLOC) {
 			ap->flag &= ~(ALLOC|ISSET);
 			afree((void*)ap->val.s, APERM);
+		}
 		ap->flag &= ~(DEFINED|ISSET|EXPORT);
+	}
 	if (all) {
 		struct tstate ts;
-		for (twalk(&ts, t); (ap = tnext(&ts)); ) {
+		for (ksh_twalk(&ts, t); (ap = tnext(&ts)); ) {
 			if (ap->flag&ALLOC) {
 				ap->flag &= ~(ALLOC|ISSET);
 				afree((void*)ap->val.s, APERM);
+			}
 			ap->flag &= ~(DEFINED|ISSET|EXPORT);
+		}
+	}
 	return rv;
+}
 #ifdef KSH
 int

 @@ -1,23 +1,23 @@
-/*	$NetBSD: edit.c,v 1.34 2017/07/01 23:12:08 joerg Exp $	*/
+/*	$NetBSD: edit.c,v 1.35 2018/06/03 12:18:29 kamil Exp $	*/
 /*
  * Command line editing - common code
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: edit.c,v 1.34 2017/07/01 23:12:08 joerg Exp $");
+__RCSID("$NetBSD: edit.c,v 1.35 2018/06/03 12:18:29 kamil Exp $");
 #endif
 #include <stdbool.h>
 #include "config.h"
 #ifdef EDIT
 #include "sh.h"
 #include "tty.h"
 #define EXTERN
 #include "edit.h"
 #undef EXTERN
 #include <sys/ioctl.h>
 @@ -928,27 +928,27 @@ x_basename(s, se)
 /*
  *  Apply pattern matching to a table: all table entries that match a pattern
  * are added to wp.
  */
 static void
 glob_table(pat, wp, tp)
 	const char *pat;
 	XPtrV *wp;
 	struct table *tp;
+{
 	struct tstate ts;
 	struct tbl *te;
-	for (twalk(&ts, tp); (te = tnext(&ts)); ) {
+	for (ksh_twalk(&ts, tp); (te = tnext(&ts)); ) {
 		if (gmatch(te->name, pat, false))
 			XPput(*wp, str_save(te->name, ATEMP));
+	}
+}
 static void
 glob_path(flags, pat, wp, xpath)
 	int flags;
 	const char *pat;
 	XPtrV *wp;
 	const char *xpath;
+{
 	const char *sp, *p;

 @@ -1,22 +1,22 @@
-/*	$NetBSD: exec.c,v 1.27 2018/05/08 16:37:59 kamil Exp $	*/
+/*	$NetBSD: exec.c,v 1.28 2018/06/03 12:18:29 kamil Exp $	*/
 /*
  * execute command tree
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: exec.c,v 1.27 2018/05/08 16:37:59 kamil Exp $");
+__RCSID("$NetBSD: exec.c,v 1.28 2018/06/03 12:18:29 kamil Exp $");
 #endif
 #include <sys/stat.h>
 #include <ctype.h>
 #include <stdbool.h>
 #include "sh.h"
 #include "c_test.h"
 /* Does ps4 get parameter substitutions done? */
 #ifdef KSH
 # define PS4_SUBSTITUTE(s)	substitute((s), 0)
 #else
 @@ -989,27 +989,27 @@ findcom(name, flags)
 	return tp;
+}
 /*
  * flush executable commands with relative paths
  */
 void
 flushcom(all)
 	int all;		/* just relative or all */
+{
 	struct tbl *tp;
 	struct tstate ts;
-	for (twalk(&ts, &taliases); (tp = tnext(&ts)) != NULL; )
+	for (ksh_twalk(&ts, &taliases); (tp = tnext(&ts)) != NULL; )
 		if ((tp->flag&ISSET) && (all || !ISDIRSEP(tp->val.s[0]))) {
 			if (tp->flag&ALLOC) {
 				tp->flag &= ~(ALLOC|ISSET);
 				afree(tp->val.s, APERM);
+			}
 			tp->flag &= ~ISSET;
+		}
+}
 /* Check if path is something we want to find.  Returns -1 for failure. */
 int
 search_access(pathx, mode, errnop)
 	const char *pathx;

 @@ -1,19 +1,19 @@
-/*	$NetBSD: proto.h,v 1.12 2018/01/24 09:53:21 kamil Exp $	*/
+/*	$NetBSD: proto.h,v 1.13 2018/06/03 12:18:29 kamil Exp $	*/
 /*
  * prototypes for PD-KSH
  * originally generated using "cproto.c 3.5 92/04/11 19:28:01 cthuang "
- * $Id: proto.h,v 1.12 2018/01/24 09:53:21 kamil Exp $
+ * $Id: proto.h,v 1.13 2018/06/03 12:18:29 kamil Exp $
  */
 #include <stdbool.h>
 /* alloc.c */
 Area *	ainit		ARGS((Area *));
 void 	afreeall	ARGS((Area *));
 void *	alloc		ARGS((size_t, Area *));
 void *	aresize		ARGS((void *, size_t, Area *));
 void 	afree		ARGS((void *, Area *));
 /* c_ksh.c */
 int 	c_hash		ARGS((char **));
 int 	c_cd		ARGS((char **));
 @@ -209,27 +209,27 @@ int	make_path	ARGS((const char *, const
 			      char **, XString *, int *));
 void	simplify_path	ARGS((char *));
 char	*get_phys_path	ARGS((const char *));
 void	set_current_wd	ARGS((char *));
 /* syn.c */
 void 	initkeywords	ARGS((void));
 struct op * compile	ARGS((Source *));
 /* table.c */
 unsigned int 	hash	ARGS((const char *));
 void 	tinit		ARGS((struct table *, Area *, int));
 struct tbl *	mytsearch	ARGS((struct table *, const char *, unsigned int));
 struct tbl *	tenter	ARGS((struct table *, const char *, unsigned int));
 void 	mytdelete		ARGS((struct tbl *));
-void 	twalk		ARGS((struct tstate *, struct table *));
+void 	ksh_twalk		ARGS((struct tstate *, struct table *));
 struct tbl *	tnext	ARGS((struct tstate *));
 struct tbl **	tsort	ARGS((struct table *));
 /* trace.c */
 /* trap.c */
 void	inittraps	ARGS((void));
 #ifdef KSH
 void	alarm_init	ARGS((void));
 #endif /* KSH */
 Trap *	gettrap		ARGS((const char *, int));
 RETSIGTYPE trapsig	ARGS((int));
 void	intrcheck	ARGS((void));
 int	fatal_trap_check ARGS((void));
 int	trap_pending	ARGS((void));

 @@ -1,22 +1,22 @@
-/*	$NetBSD: table.c,v 1.7 2018/05/08 16:37:59 kamil Exp $	*/
+/*	$NetBSD: table.c,v 1.8 2018/06/03 12:18:29 kamil Exp $	*/
 /*
  * dynamic hashed associative table for commands and variables
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: table.c,v 1.7 2018/05/08 16:37:59 kamil Exp $");
+__RCSID("$NetBSD: table.c,v 1.8 2018/06/03 12:18:29 kamil Exp $");
 #endif
 #include "sh.h"
 #define	INIT_TBLS	8	/* initial table size (power of 2) */
 static void     texpand     ARGS((struct table *tp, int nsize));
 static int      tnamecmp    ARGS((void *p1, void *p2));
 unsigned int
 hash(n)
 @@ -141,27 +141,27 @@ tenter(tp, n, h)
 	tp->nfree--;
 	*pp = p;
 	return p;
+}
 void
 mytdelete(p)
 	struct tbl *p;
+{
 	p->flag = 0;
+}
 void
-twalk(ts, tp)
+ksh_twalk(ts, tp)
 	struct tstate *ts;
 	struct table *tp;
+{
 	ts->left = tp->size;
 	ts->next = tp->tbls;
+}
 struct tbl *
 tnext(ts)
 	struct tstate *ts;
+{
 	while (--ts->left >= 0) {
 		struct tbl *p = *ts->next++;
 @@ -206,27 +206,27 @@ void
 tprintinfo(tp)
 	struct table *tp;
+{
 	struct tbl *te;
 	char *n;
 	unsigned int h;
 	int ncmp;
 	int totncmp = 0, maxncmp = 0;
 	int nentries = 0;
 	struct tstate ts;
 	shellf("table size %d, nfree %d\n", tp->size, tp->nfree);
 	shellf("    Ncmp name\n");
-	twalk(&ts, tp);
+	ksh_twalk(&ts, tp);
 	while ((te = tnext(&ts))) {
 		struct tbl **pp, *p;
 		h = hash(n = te->name);
 		ncmp = 0;
 		/* taken from mytsearch() and added counter */
 		for (pp = &tp->tbls[h & (tp->size-1)]; (p = *pp); pp--) {
 			ncmp++;
 			if (*p->name == *n && strcmp(p->name, n) == 0
 			    && (p->flag&DEFINED))
 				break; /* return p; */
 			if (pp == tp->tbls) /* wrap */

 @@ -1,14 +1,14 @@
-/* $NetBSD: table.h,v 1.3 1999/10/20 15:10:00 hubertf Exp $ */
+/* $NetBSD: table.h,v 1.4 2018/06/03 12:18:29 kamil Exp $ */
 /*
  * generic hashed associative table for commands and variables.
  */
 struct table {
 	Area   *areap;		/* area to allocate entries */
 	short	size, nfree;	/* hash size (always 2^^n), free entries */
 	struct	tbl **tbls;	/* hashed table items */
 };
 struct tbl {			/* table item */
 	Tflag	flag;		/* flags */
 @@ -117,27 +117,27 @@ struct block {
 #if 1
 	char *	error;		/* error handler */
 	char *	exit;		/* exit handler */
 #else
 	Trap	error, exit;
 #endif
 	struct	block *next;	/* enclosing block */
 };
 /* Values for struct block.flags */
 #define BF_DOGETOPTS	BIT(0)	/* save/restore getopts state */
 /*
- * Used by twalk() and tnext() routines.
+ * Used by ksh_twalk() and tnext() routines.
  */
 struct tstate {
 	int left;
 	struct tbl **next;
 };
 EXTERN	struct table taliases;	/* tracked aliases */
 EXTERN	struct table builtins;	/* built-in commands */
 EXTERN	struct table aliases;	/* aliases */
 EXTERN	struct table keywords;	/* keywords */
 EXTERN	struct table homedirs;	/* homedir() cache */