From b398f33c49d2fbc2e9e8b39ade644c718b8630db Mon Sep 17 00:00:00 2001
From: Martijn Dekker <martijn@inlv.org>
Date: Tue, 1 Mar 2022 21:10:38 +0100
Subject: [PATCH] Another round of accumulated minor fixes and cleanups

Only notable changes listed below.

**/Mamfile:
- Do not bother redirecting standard error for 'cmp -s' to
  /dev/null. Normally, 'cmp -s' on Linux, macOS, *BSD, or Solaris
  do not not print any message. If it does, something unusual is
  going on and I would want to see the message.
- Since we now require a POSIX shell, we can use '!'.

src/cmd/ksh93/include/defs.h,
src/cmd/ksh93/sh/init.c:
- Remove SH_TYPE_PROFILE symbol, unused after the removal of the
  SHOPT_PFSH code. (re: eabd6453)

src/cmd/ksh93/sh/io.c:
- piperead(), slowread(): Replace redundant sffileno() calls by
  the variables already containing their results. (re: 50d342e4)

src/cmd/ksh93/bltins/mkservice.c,
rc/lib/libcmd/vmstate.c:
- If these aren't compiled, define a stub function to silence the
  ranlib(1) warning that the .o file does not contain symbols.
---
 src/cmd/ksh93/Mamfile              |  15 +-
 src/cmd/ksh93/bltins/hist.c        |   1 -
 src/cmd/ksh93/bltins/mkservice.c   |   4 +-
 src/cmd/ksh93/bltins/print.c       |   3 -
 src/cmd/ksh93/bltins/read.c        |   1 -
 src/cmd/ksh93/bltins/regress.c     |   6 -
 src/cmd/ksh93/bltins/test.c        |   5 -
 src/cmd/ksh93/bltins/trap.c        |   1 -
 src/cmd/ksh93/bltins/typeset.c     |   5 -
 src/cmd/ksh93/data/builtins.c      |   2 +-
 src/cmd/ksh93/edit/history.c       |  15 +-
 src/cmd/ksh93/include/defs.h       |   1 -
 src/cmd/ksh93/sh.1                 |   2 +-
 src/cmd/ksh93/sh/arith.c           |   2 -
 src/cmd/ksh93/sh/expand.c          |   1 -
 src/cmd/ksh93/sh/fault.c           |   2 -
 src/cmd/ksh93/sh/init.c            |   6 +-
 src/cmd/ksh93/sh/io.c              |  11 +-
 src/cmd/ksh93/sh/jobs.c            |  16 -
 src/cmd/ksh93/sh/lex.c             |   2 -
 src/cmd/ksh93/sh/main.c            |   2 -
 src/cmd/ksh93/sh/name.c            |   2 -
 src/cmd/ksh93/sh/parse.c           |   6 -
 src/cmd/ksh93/sh/path.c            |  10 +-
 src/cmd/ksh93/sh/streval.c         |   2 -
 src/cmd/ksh93/sh/string.c          |   3 -
 src/cmd/ksh93/sh/subshell.c        |   1 -
 src/cmd/ksh93/sh/suid_exec.c       |   6 -
 src/cmd/ksh93/sh/waitevent.c       |   2 -
 src/cmd/ksh93/sh/xec.c             |   2 -
 src/cmd/ksh93/tests/attributes.sh  |  24 +-
 src/cmd/ksh93/tests/builtins.sh    |  61 ++-
 src/cmd/ksh93/tests/comvar.sh      |   3 +-
 src/cmd/ksh93/tests/comvario.sh    |   5 +-
 src/cmd/ksh93/tests/io.sh          |   1 +
 src/lib/libast/Mamfile             | 605 ++++++++++++-----------------
 src/lib/libast/disc/sfdcfilter.c   |   2 +-
 src/lib/libast/disc/sfdcseekable.c |   2 +-
 src/lib/libcmd/Mamfile             |  19 +-
 src/lib/libcmd/vmstate.c           |   4 +-
 src/lib/libdll/Mamfile             |   7 +-
 src/lib/libsum/Mamfile             |   5 +-
 42 files changed, 352 insertions(+), 523 deletions(-)

diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile
index f92531274..3936ff926 100644
--- a/src/cmd/ksh93/Mamfile
+++ b/src/cmd/ksh93/Mamfile
@@ -1501,23 +1501,20 @@ make install
 	make ${PACKAGE_ast_INCLUDE}/nval.h
 		prev ${PACKAGE_ast_INCLUDE}
 		prev include/nval.h
-		exec - if cmp 2>/dev/null -s include/nval.h ${PACKAGE_ast_INCLUDE}/nval.h
-		exec - then :
-		exec - else ${STDCP} include/nval.h ${PACKAGE_ast_INCLUDE}/nval.h
+		exec - if ! cmp -s include/nval.h ${PACKAGE_ast_INCLUDE}/nval.h
+		exec - then ${STDCP} include/nval.h ${PACKAGE_ast_INCLUDE}/nval.h
 		exec - fi
 	done ${PACKAGE_ast_INCLUDE}/nval.h generated
 	make ${PACKAGE_ast_INCLUDE}/shell.h
 		prev include/shell.h
-		exec - if cmp 2>/dev/null -s include/shell.h ${PACKAGE_ast_INCLUDE}/shell.h
-		exec - then :
-		exec - else ${STDCP} include/shell.h ${PACKAGE_ast_INCLUDE}/shell.h
+		exec - if ! cmp -s include/shell.h ${PACKAGE_ast_INCLUDE}/shell.h
+		exec - then ${STDCP} include/shell.h ${PACKAGE_ast_INCLUDE}/shell.h
 		exec - fi
 	done ${PACKAGE_ast_INCLUDE}/shell.h generated
 	make ${PACKAGE_ast_INCLUDE}/history.h
 		prev include/history.h
-		exec - if cmp 2>/dev/null -s include/history.h ${PACKAGE_ast_INCLUDE}/history.h
-		exec - then :
-		exec - else ${STDCP} include/history.h ${PACKAGE_ast_INCLUDE}/history.h
+		exec - if ! cmp -s include/history.h ${PACKAGE_ast_INCLUDE}/history.h
+		exec - then ${STDCP} include/history.h ${PACKAGE_ast_INCLUDE}/history.h
 		exec - fi
 	done ${PACKAGE_ast_INCLUDE}/history.h generated
 	make ${INSTALLROOT}/bin/suid_exec
diff --git a/src/cmd/ksh93/bltins/hist.c b/src/cmd/ksh93/bltins/hist.c
index 562828f7b..fb290a29c 100644
--- a/src/cmd/ksh93/bltins/hist.c
+++ b/src/cmd/ksh93/bltins/hist.c
@@ -297,7 +297,6 @@ int	b_hist(int argc,char *argv[], Shbltin_t *context)
  * given a file containing a command and a string of the form old=new,
  * execute the command with the string old replaced by new
  */
-
 static void hist_subst(const char *command,int fd,char *replace)
 {
 	register char *newp=replace;
diff --git a/src/cmd/ksh93/bltins/mkservice.c b/src/cmd/ksh93/bltins/mkservice.c
index 551bb6d8e..9bce66840 100644
--- a/src/cmd/ksh93/bltins/mkservice.c
+++ b/src/cmd/ksh93/bltins/mkservice.c
@@ -25,7 +25,9 @@
  * AT&T Labs
  */
 
-#if SHOPT_MKSERVICE
+#if !SHOPT_MKSERVICE
+void _STUB_b_mkservice(){}
+#else
 
 static const char mkservice_usage[] =
 "[-?\n@(#)$Id: mkservice (AT&T Research) 2001-06-13 $\n]"
diff --git a/src/cmd/ksh93/bltins/print.c b/src/cmd/ksh93/bltins/print.c
index 94d0bed1b..f4772f4da 100644
--- a/src/cmd/ksh93/bltins/print.c
+++ b/src/cmd/ksh93/bltins/print.c
@@ -163,7 +163,6 @@ static int infof(Opt_t* op, Sfio_t* sp, const char* s, Optdisc_t* dp)
  * argc==0 when called from echo
  * argc==-1 when called from printf
  */
-
 int    b_print(int argc, char *argv[], Shbltin_t *context)
 {
 	register Sfio_t *outfile;
@@ -397,7 +396,6 @@ printf_v:
  * if <raw> is non-zero then \ is not a special character.
  * returns 0 for \c otherwise 1.
  */
-
 static int echolist(Sfio_t *outfile, int raw, char *argv[])
 {
 	register char	*cp;
@@ -1054,7 +1052,6 @@ static int extend(Sfio_t* sp, void* v, Sffmt_t* fe)
  * Otherwise, puts null-terminated result on stack, but doesn't freeze it
  * returns length of output.
  */
-
 static int fmtvecho(const char *string, struct printf *pp)
 {
 	register const char *cp = string, *cpmax;
diff --git a/src/cmd/ksh93/bltins/read.c b/src/cmd/ksh93/bltins/read.c
index d029b5adb..745211ca3 100644
--- a/src/cmd/ksh93/bltins/read.c
+++ b/src/cmd/ksh93/bltins/read.c
@@ -212,7 +212,6 @@ static void timedout(void *handle)
  *  <flags> is union of -A, -r, -s, and contains delimiter if not '\n'
  *  <timeout> is the number of milliseconds until timeout
  */
-
 int sh_readline(char **names, volatile int fd, int flags, ssize_t size, long timeout)
 {
 	register ssize_t	c;
diff --git a/src/cmd/ksh93/bltins/regress.c b/src/cmd/ksh93/bltins/regress.c
index 9f8db6919..83e862c6f 100644
--- a/src/cmd/ksh93/bltins/regress.c
+++ b/src/cmd/ksh93/bltins/regress.c
@@ -132,7 +132,6 @@ void sh_regress_init(void)
 /*
  * regress info trace output
  */
-
 void sh_regress(unsigned int index, const char* intercept, const char* info, unsigned int line, const char* file)
 {
 	char*	name;
@@ -148,7 +147,6 @@ void sh_regress(unsigned int index, const char* intercept, const char* info, uns
 /*
  * EGID intercepts
  */
-
 static gid_t	intercept_sgid = 0;
 static gid_t	intercept_egid = -1;
 static gid_t	intercept_rgid = -1;
@@ -191,7 +189,6 @@ int setgid(gid_t gid)
 /*
  * EUID intercepts
  */
-
 static uid_t	intercept_suid = 0;
 static uid_t	intercept_euid = -1;
 static uid_t	intercept_ruid = -1;
@@ -234,7 +231,6 @@ int setuid(uid_t uid)
 /*
  * p_suid intercept
  */
-
 static uid_t	intercept_p_suid = 0x7fffffff;
 
 uid_t sh_regress_p_suid(unsigned int line, const char* file)
@@ -246,7 +242,6 @@ uid_t sh_regress_p_suid(unsigned int line, const char* file)
 /*
  * p_suid intercept
  */
-
 static char*	intercept_etc = 0;
 
 char* sh_regress_etc(const char* path, unsigned int line, const char* file)
@@ -258,7 +253,6 @@ char* sh_regress_etc(const char* path, unsigned int line, const char* file)
 /*
  * __regress__ builtin
  */
-
 int b___regress__(int argc, char** argv, Shbltin_t *context)
 {
 	int			n;
diff --git a/src/cmd/ksh93/bltins/test.c b/src/cmd/ksh93/bltins/test.c
index a3fd8d26c..a0c071d00 100644
--- a/src/cmd/ksh93/bltins/test.c
+++ b/src/cmd/ksh93/bltins/test.c
@@ -27,7 +27,6 @@
  *
  */
 
-
 #include	"defs.h"
 #include	<error.h>
 #include	<ls.h>
@@ -560,7 +559,6 @@ int test_binop(register int op,const char *left,const char *right)
 /*
  * returns the modification time of f1 - modification time of f2
  */
-
 static time_t test_time(const char *file1,const char *file2)
 {
 	Time_t t1, t2;
@@ -582,7 +580,6 @@ static time_t test_time(const char *file1,const char *file2)
 /*
  * return true if inode of two files are the same
  */
-
 int test_inode(const char *file1,const char *file2)
 {
 	struct stat stat1,stat2;
@@ -597,7 +594,6 @@ int test_inode(const char *file1,const char *file2)
  * This version of access checks against the effective UID/GID
  * The static buffer statb is shared with test_mode.
  */
-
 int sh_access(register const char *name, register int mode)
 {
 	struct stat statb;
@@ -685,7 +681,6 @@ skip:
  * If <file> is null, then the previous stat buffer is used.
  * The mode bits are zero if the file doesn't exist.
  */
-
 static int test_mode(register const char *file)
 {
 	struct stat statb;
diff --git a/src/cmd/ksh93/bltins/trap.c b/src/cmd/ksh93/bltins/trap.c
index dc69eea69..383efc6bd 100644
--- a/src/cmd/ksh93/bltins/trap.c
+++ b/src/cmd/ksh93/bltins/trap.c
@@ -316,7 +316,6 @@ int	b_suspend(int argc,char *argv[],Shbltin_t *context)
 /*
  * Given the name or number of a signal return the signal number
  */
-
 static int sig_number(const char *string)
 {
 	const Shtable_t	*tp;
diff --git a/src/cmd/ksh93/bltins/typeset.c b/src/cmd/ksh93/bltins/typeset.c
index 844a3c97e..e11319905 100644
--- a/src/cmd/ksh93/bltins/typeset.c
+++ b/src/cmd/ksh93/bltins/typeset.c
@@ -1024,7 +1024,6 @@ static int		maxlib;
  * always move to head of search list
  * return: 0: already loaded 1: first load
  */
-
 int sh_addlib(void* dll, char* name, Pathcomp_t* pp)
 {
 	register int	n;
@@ -1391,7 +1390,6 @@ static int unall(int argc, char **argv, register Dt_t *troot)
 					sh_subfork();	/* avoid affecting the parent shell's alias table */
 				nv_delete(np,troot,nofree_attr);
 			}
-
 		}
 		else if(troot==sh.alias_tree)
 			r = 1;
@@ -1404,7 +1402,6 @@ static int unall(int argc, char **argv, register Dt_t *troot)
 /*
  * print out the name and value of a name-value pair <np>
  */
-
 static int print_namval(Sfio_t *file,register Namval_t *np,register int flag, struct tdata *tp)
 {
 	register char *cp;
@@ -1549,7 +1546,6 @@ static void	print_attribute(register Namval_t *np,void *data)
  * print the nodes in tree <root> which have attributes <flag> set
  * if <option> is non-zero, no subscript or value is printed
  */
-
 static void print_scan(Sfio_t *file, int flag, Dt_t *root, int option,struct tdata *tp)
 {
 	register char **argv;
@@ -1616,7 +1612,6 @@ static void print_scan(Sfio_t *file, int flag, Dt_t *root, int option,struct tda
 /*
  * add the name of the node to the argument list argnam
  */
-
 static void pushname(Namval_t *np,void *data)
 {
 	struct tdata *tp = (struct tdata*)data;
diff --git a/src/cmd/ksh93/data/builtins.c b/src/cmd/ksh93/data/builtins.c
index 4bb09e1b5..bd49d9a9a 100644
--- a/src/cmd/ksh93/data/builtins.c
+++ b/src/cmd/ksh93/data/builtins.c
@@ -1448,7 +1448,7 @@ const char sh_optread[] =
 "\n[var?prompt] [var ...]\n"
 "\n"
 "[+EXIT STATUS?]{"
-	"[+0? Successful completion.]"
+	"[+0?Successful completion.]"
 	"[+>0?End of file was detected or an error occurred.]"
 "}"
 "[+SEE ALSO?\bprint\b(1), \bprintf\b(1), \bcat\b(1)]"
diff --git a/src/cmd/ksh93/edit/history.c b/src/cmd/ksh93/edit/history.c
index 9b9397eee..666cd25bc 100644
--- a/src/cmd/ksh93/edit/history.c
+++ b/src/cmd/ksh93/edit/history.c
@@ -357,7 +357,6 @@ retry:
 /*
  * close the history file and free the space
  */
-
 void hist_close(register History_t *hp)
 {
 	sfclose(hp->histfp);
@@ -405,7 +404,6 @@ static int hist_clean(int fd)
 /*
  * Copy the last <n> commands to a new file and make this the history file
  */
-
 static History_t* hist_trim(History_t *hp, int n)
 {
 	register char *cp;
@@ -571,7 +569,6 @@ begin:
  * unless it is followed by 0.  If followed by 0 then it cancels
  * the previous command.
  */
-
 void hist_eof(register History_t *hp)
 {
 	register char *cp,*first,*endbuff;
@@ -685,7 +682,6 @@ again:
 /*
  * This routine will cause the previous command to be cancelled
  */
-
 void hist_cancel(register History_t *hp)
 {
 	register int c;
@@ -702,7 +698,6 @@ void hist_cancel(register History_t *hp)
 /*
  * flush the current history command
  */
-
 void hist_flush(register History_t *hp)
 {
 	register char *buff;
@@ -730,7 +725,6 @@ void hist_flush(register History_t *hp)
  * When called from hist_flush(), trailing newlines are deleted and
  * a zero byte.  Line sequencing is added as required
  */
-
 static ssize_t hist_write(Sfio_t *iop,const void *buff,register size_t insize,Sfdisc_t* handle)
 {
 	register History_t *hp = (History_t*)handle;
@@ -821,7 +815,6 @@ static ssize_t hist_write(Sfio_t *iop,const void *buff,register size_t insize,Sf
  * Put history sequence number <n> into buffer <buff>
  * The buffer must be large enough to hold HIST_MARKSZ chars
  */
-
 static void hist_marker(register char *buff,register long cmdno)
 {
 	*buff++ = HIST_CMDNO;
@@ -855,7 +848,6 @@ off_t hist_seek(register History_t *hp, int n)
  * if character <last> appears before newline it is deleted
  * each new-line character is replaced with string <nl>.
  */
-
 void hist_list(register History_t *hp,Sfio_t *outfile, off_t offset,int last, char *nl)
 {
 	register int oldc=0;
@@ -880,13 +872,12 @@ void hist_list(register History_t *hp,Sfio_t *outfile, off_t offset,int last, ch
 	}
 	return;
 }
-		 
+
 /*
  * find index for last line with given string
  * If flag==0 then line must begin with string
  * direction < 1 for backwards search
 */
-
 Histloc_t hist_find(register History_t*hp,char *string,register int index1,int flag,int direction)
 {
 	register int index2;
@@ -944,7 +935,6 @@ Histloc_t hist_find(register History_t*hp,char *string,register int index1,int f
  * If coffset==0 then line must begin with string
  * returns the line number of the match if successful, otherwise -1
  */
-
 int hist_match(register History_t *hp,off_t offset,char *string,int *coffset)
 {
 	register unsigned char *first, *cp;
@@ -985,7 +975,6 @@ int hist_match(register History_t *hp,off_t offset,char *string,int *coffset)
  * line < 0 for full command copy
  * -1 returned if there is no history file
  */
-
 int hist_copy(char *s1,int size,int command,int line)
 {
 	register int c;
@@ -1026,7 +1015,6 @@ int hist_copy(char *s1,int size,int command,int line)
 /*
  * return word number <word> from command number <command>
  */
-
 char *hist_word(char *string,int size,int word)
 {
 	register int c;
@@ -1081,7 +1069,6 @@ char *hist_word(char *string,int size,int word)
  * and number of lines back or forward,
  * compute the new command and line number.
  */
-
 Histloc_t hist_locate(History_t *hp,register int command,register int line,int lines)
 {
 	Histloc_t next;
diff --git a/src/cmd/ksh93/include/defs.h b/src/cmd/ksh93/include/defs.h
index 8a3854788..6e3395c76 100644
--- a/src/cmd/ksh93/include/defs.h
+++ b/src/cmd/ksh93/include/defs.h
@@ -98,7 +98,6 @@ extern char*	sh_setenviron(const char*);
 #define SH_TYPE_KSH		002
 #define SH_TYPE_POSIX		004
 #define SH_TYPE_LOGIN		010
-#define SH_TYPE_PROFILE		020
 #define SH_TYPE_RESTRICTED	040
 
 #ifndef PIPE_BUF
diff --git a/src/cmd/ksh93/sh.1 b/src/cmd/ksh93/sh.1
index 8f423cd0d..dc25a8df1 100644
--- a/src/cmd/ksh93/sh.1
+++ b/src/cmd/ksh93/sh.1
@@ -1734,7 +1734,7 @@ element stores the
 .IR i\^ -th
 submatch.
 For
-.B //
+.BR // ,
 the array is two-dimensional, with the first subscript indicating the
 most recent match and subpattern match, and the second subscript indicating
 which match with
diff --git a/src/cmd/ksh93/sh/arith.c b/src/cmd/ksh93/sh/arith.c
index 7aded4905..b16ef009a 100644
--- a/src/cmd/ksh93/sh/arith.c
+++ b/src/cmd/ksh93/sh/arith.c
@@ -511,7 +511,6 @@ static Sfdouble_t arith(const char **ptr, struct lval *lvalue, int type, Sfdoubl
 		}
 		return(r);
 	    }
-
 	    case MESSAGE:
 		sfsync(NIL(Sfio_t*));
 		if(lvalue->emode&ARITH_COMP)
@@ -527,7 +526,6 @@ static Sfdouble_t arith(const char **ptr, struct lval *lvalue, int type, Sfdoubl
  * ptr is set to the last character processed
  * if mode>0, an error will be fatal with value <mode>
  */
-
 Sfdouble_t sh_strnum(register const char *str, char** ptr, int mode)
 {
 	register Sfdouble_t d;
diff --git a/src/cmd/ksh93/sh/expand.c b/src/cmd/ksh93/sh/expand.c
index fbb58976c..aeda8fde0 100644
--- a/src/cmd/ksh93/sh/expand.c
+++ b/src/cmd/ksh93/sh/expand.c
@@ -144,7 +144,6 @@ static int scantree(Dt_t *tree, const char *pattern, struct argnod **arghead)
  * generate the list of files found by adding an suffix to end of name
  * The number of matches is returned
  */
-
 int path_complete(const char *name,register const char *suffix, struct argnod **arghead)
 {
 	sufstr = suffix;
diff --git a/src/cmd/ksh93/sh/fault.c b/src/cmd/ksh93/sh/fault.c
index c27ed3eda..25570c3d7 100644
--- a/src/cmd/ksh93/sh/fault.c
+++ b/src/cmd/ksh93/sh/fault.c
@@ -380,7 +380,6 @@ void	sh_sigclear(register int sig)
 /*
  * check for traps
  */
-
 void	sh_chktrap(void)
 {
 	register int 	sig=sh.st.trapmax;
@@ -606,7 +605,6 @@ static void array_notify(Namval_t *np, void *data)
 /*
  * This is the exit routine for the shell
  */
-
 noreturn void sh_done(register int sig)
 {
 	register char *t;
diff --git a/src/cmd/ksh93/sh/init.c b/src/cmd/ksh93/sh/init.c
index 1fe1ddbae..840abe282 100644
--- a/src/cmd/ksh93/sh/init.c
+++ b/src/cmd/ksh93/sh/init.c
@@ -1192,7 +1192,7 @@ int sh_type(register const char *path)
 				continue;
 			}
 		}
-		if (!(t & (SH_TYPE_PROFILE|SH_TYPE_RESTRICTED)))
+		if (!(t & SH_TYPE_RESTRICTED))
 		{
 			if (*s == 'r')
 			{
@@ -1222,7 +1222,7 @@ int sh_type(register const char *path)
 		if (!isalnum(*s))
 			return t;
 	}
-	return t & ~(SH_TYPE_KSH|SH_TYPE_PROFILE|SH_TYPE_RESTRICTED);
+	return t & ~(SH_TYPE_KSH|SH_TYPE_RESTRICTED);
 }
 
 
@@ -1948,7 +1948,6 @@ static Init_t *nv_init(void)
 /*
  * initialize name-value pairs
  */
-
 Dt_t *sh_inittree(const struct shtable2 *name_vals)
 {
 	register Namval_t *np;
@@ -2006,7 +2005,6 @@ Dt_t *sh_inittree(const struct shtable2 *name_vals)
  *
  * Returns pointer to A__z env var from which to import attributes, or 0.
  */
-
 static char *env_init(void)
 {
 	register char		*cp;
diff --git a/src/cmd/ksh93/sh/io.c b/src/cmd/ksh93/sh/io.c
index a3b749238..4d26420b5 100644
--- a/src/cmd/ksh93/sh/io.c
+++ b/src/cmd/ksh93/sh/io.c
@@ -211,7 +211,6 @@ static int	onintr(struct addrinfo*);
  * return <protocol>/<host>/<service> fd
  * If called with flags==O_NONBLOCK return 1 if protocol is supported
  */
-
 static int
 inetopen(const char* path, int flags)
 {
@@ -1927,7 +1926,7 @@ static ssize_t piperead(Sfio_t *iop,void *buff,register size_t size,Sfdisc_t *ha
 		errno = EINTR;
 		return(-1);
 	}
-	if(sh_isstate(SH_INTERACTIVE) && sffileno(iop)==0 && io_prompt(iop,sh.nextprompt)<0 && errno==EIO)
+	if(sh_isstate(SH_INTERACTIVE) && fd==0 && io_prompt(iop,sh.nextprompt)<0 && errno==EIO)
 		return(0);
 	sh_onstate(SH_TTYWAIT);
 	if(!(sh.fdstatus[fd]&IOCLEX) && (sfset(iop,0,0)&SF_SHARE))
@@ -1983,7 +1982,7 @@ static ssize_t slowread(Sfio_t *iop,void *buff,register size_t size,Sfdisc_t *ha
 			return(0);
 		if(sh.timeout)
 			timeout = (void*)sh_timeradd(sh_isstate(SH_GRACE)?1000L*TGRACE:1000L*sh.timeout,0,time_grace,&sh);
-		rsize = (*readf)(sh.ed_context, sffileno(iop), (char*)buff, size, reedit);
+		rsize = (*readf)(sh.ed_context, fno, (char*)buff, size, reedit);
 		if(timeout)
 			timerdel(timeout);
 		timeout=0;
@@ -2040,7 +2039,6 @@ static ssize_t slowread(Sfio_t *iop,void *buff,register size_t size,Sfdisc_t *ha
 /*
  * check and return the attributes for a file descriptor
  */
-
 int sh_iocheckfd(register int fd)
 {
 	register int flags, n;
@@ -2117,7 +2115,6 @@ int sh_iocheckfd(register int fd)
 /*
  * Display prompt PS<flag> on standard error
  */
-
 static int	io_prompt(Sfio_t *iop,register int flag)
 {
 	register char *cp;
@@ -2319,7 +2316,6 @@ struct eval
 /*
  * Create a stream consisting of a space separated argv[] list 
  */
-
 Sfio_t *sh_sfeval(register char *argv[])
 {
 	register Sfio_t *iop;
@@ -2345,7 +2341,6 @@ Sfio_t *sh_sfeval(register char *argv[])
 /*
  * This code gets called whenever an end of string is found with eval
  */
-
 static int eval_exceptf(Sfio_t *iop,int type, void *data, Sfdisc_t *handle)
 {
 	register struct eval *ep = (struct eval*)handle;
@@ -2385,7 +2380,6 @@ static int eval_exceptf(Sfio_t *iop,int type, void *data, Sfdisc_t *handle)
  * the stream <sp> starting at offset <offset>
  * The stream can be read with the normal stream operations
  */
-
 static Sfio_t *subopen(Sfio_t* sp, off_t offset, long size)
 {
 	register struct subfile *disp;
@@ -2604,7 +2598,6 @@ mode_t	sh_umask(mode_t m)
  * <fd> must be a non-negative number ofr SH_IOCOPROCESS or SH_IOHISTFILE. 
  * returns NULL on failure and may set errno.
  */
-
 Sfio_t *sh_iogetiop(int fd, int mode)
 {
 	int n;
diff --git a/src/cmd/ksh93/sh/jobs.c b/src/cmd/ksh93/sh/jobs.c
index 1fdbde785..36f17518e 100644
--- a/src/cmd/ksh93/sh/jobs.c
+++ b/src/cmd/ksh93/sh/jobs.c
@@ -794,7 +794,6 @@ static void job_reset(register struct process *pw)
 /*
  * wait built-in command
  */
-
 void job_bwait(char **jobs)
 {
 	register char *jp;
@@ -826,7 +825,6 @@ void job_bwait(char **jobs)
 /*
  * execute function <fun> for each job
  */
-
 int job_walk(Sfio_t *file,int (*fun)(struct process*,int),int arg,char *joblist[])
 {
 	register struct process *pw;
@@ -894,7 +892,6 @@ int job_walk(Sfio_t *file,int (*fun)(struct process*,int),int arg,char *joblist[
  * flag JOB_NFLAG for list only jobs marked for notification
  * flag JOB_PFLAG for process ID(s) only
  */
-
 int job_list(struct process *pw,register int flag)
 {
 	register struct process *px = pw;
@@ -1002,7 +999,6 @@ static struct process *job_bystring(register char *ajob)
 /*
  * Kill a job or process
  */
-
 int job_kill(register struct process *pw,register int sig)
 {
 	register pid_t pid;
@@ -1127,7 +1123,6 @@ int job_hup(struct process *pw, int sig)
 /*
  * Get process structure from first letters of jobname
  */
-
 static struct process *job_byname(char *name)
 {
 	register struct process *pw = job.pwlist;
@@ -1163,7 +1158,6 @@ static struct process *job_byname(char *name)
 /*
  * Initialize the process posting array
  */
-
 void	job_clear(void)
 {
 	register struct process *pw, *px;
@@ -1207,7 +1201,6 @@ void	job_clear(void)
  * put the process <pid> on the process list and return the job number
  * if non-zero, <join> is the process ID of the job to join
  */
-
 int job_post(pid_t pid, pid_t join)
 {
 	register struct process *pw;
@@ -1332,7 +1325,6 @@ int job_post(pid_t pid, pid_t join)
 /*
  * Returns a process structure give a process ID
  */
-
 static struct process *job_bypid(pid_t pid)
 {
 	register struct process  *pw, *px;
@@ -1348,7 +1340,6 @@ static struct process *job_bypid(pid_t pid)
 /*
  * return a pointer to a job given the job ID
  */
-
 static struct process *job_byjid(int jobid)
 {
 	register struct process *pw;
@@ -1388,7 +1379,6 @@ static void job_prmsg(register struct process *pw)
  * pid=1 to wait for at least one process to complete
  * pid=-1 to wait for all running processes
  */
-
 int	job_wait(register pid_t pid)
 {
 	register struct process *pw=0,*px;
@@ -1588,7 +1578,6 @@ done:
  * move job to background if bgflag == 'b'
  * disown job if bgflag == 'd'
  */
-
 int job_switch(register struct process *pw,int bgflag)
 {
 	register const char *msg;
@@ -1652,7 +1641,6 @@ int job_switch(register struct process *pw,int bgflag)
 /*
  * Set the foreground group associated with a job
  */
-
 static void job_fgrp(register struct process *pw, int newgrp)
 {
 	for(; pw; pw=pw->p_nxtproc)
@@ -1662,7 +1650,6 @@ static void job_fgrp(register struct process *pw, int newgrp)
 /*
  * turn off STOP state of a process group and send CONT signals
  */
-
 static void job_unstop(register struct process *px)
 {
 	register struct process *pw;
@@ -1691,7 +1678,6 @@ static void job_unstop(register struct process *px)
  * pwlist is reset if the first job is removed
  * if <notify> is non-zero, then jobs with pending notifications are unposted
  */
-
 static struct process *job_unpost(register struct process *pwtop,int notify)
 {
 	register struct process *pw;
@@ -1769,7 +1755,6 @@ static void job_unlink(register struct process *pw)
  * get an unused job number
  * freejobs is a bit vector, 0 is unused
  */
-
 static int job_alloc(void)
 {
 	register int j=0;
@@ -1800,7 +1785,6 @@ static int job_alloc(void)
 /*
  * return a job number
  */
-
 static void job_free(register int n)
 {
 	register int j = (--n)/CHAR_BIT;
diff --git a/src/cmd/ksh93/sh/lex.c b/src/cmd/ksh93/sh/lex.c
index d84ca7c94..c9971851f 100644
--- a/src/cmd/ksh93/sh/lex.c
+++ b/src/cmd/ksh93/sh/lex.c
@@ -1750,7 +1750,6 @@ void sh_lexskip(Lex_t *lp,int close, register int copy, int  state)
  * noted with the IOQUOTE flag
  * returns 1 for complete here-doc, 0 for EOF
  */
-
 static int here_copy(Lex_t *lp,register struct ionod *iop)
 {
 	register const char	*state;
@@ -2071,7 +2070,6 @@ static char	*fmttoken(Lex_t *lp, register int sym)
 /*
  * print a bad syntax message
  */
-
 noreturn void sh_syntax(Lex_t *lp)
 {
 	register const char *cp = sh_translate(e_unexpected);
diff --git a/src/cmd/ksh93/sh/main.c b/src/cmd/ksh93/sh/main.c
index 53e3cfb81..5d2c20e0b 100644
--- a/src/cmd/ksh93/sh/main.c
+++ b/src/cmd/ksh93/sh/main.c
@@ -85,7 +85,6 @@ static char	beenhere = 0;
  * search for file and exfile() it if it exists
  * 1 returned if file found, 0 otherwise
  */
-
 static int sh_source(Sfio_t *iop, const char *file)
 {
 	char*	oid;
@@ -373,7 +372,6 @@ int sh_main(int ac, char *av[], Shinit_f userinit)
  * iop is not null when the input is a string
  * fdin is the input file descriptor 
  */
-
 static void	exfile(register Sfio_t *iop,register int fno)
 {
 	time_t curtime;
diff --git a/src/cmd/ksh93/sh/name.c b/src/cmd/ksh93/sh/name.c
index c5794d920..b0c085d56 100644
--- a/src/cmd/ksh93/sh/name.c
+++ b/src/cmd/ksh93/sh/name.c
@@ -2338,7 +2338,6 @@ void sh_scope(struct argnod *envlist, int fun)
  * of nnod. This includes any strings representing the value(s) of the
  * node, as well as its dope vector, if it is an array.
  */
-
 void	sh_envnolocal (register Namval_t *np, void *data)
 {
 	char *cp = 0, was_export = nv_isattr(np,NV_EXPORT)!=0;
@@ -2695,7 +2694,6 @@ void sh_optclear(void *old)
  *
  *   If <np> has no value, 0 is returned.
  */
-
 char *nv_getval(register Namval_t *np)
 {
 	register union Value *up= &np->nvalue;
diff --git a/src/cmd/ksh93/sh/parse.c b/src/cmd/ksh93/sh/parse.c
index 289bb9c61..97df31b6a 100644
--- a/src/cmd/ksh93/sh/parse.c
+++ b/src/cmd/ksh93/sh/parse.c
@@ -376,7 +376,6 @@ static Shnode_t	*makelist(Lex_t *lexp, int type, Shnode_t *l, Shnode_t *r)
  * entry to shell parser
  * Flag can be the union of SH_EOF|SH_NL
  */
-
 void	*sh_parse(Sfio_t *iop, int flag)
 {
 	register Shnode_t	*t;
@@ -507,7 +506,6 @@ Shnode_t *sh_dolparen(Lex_t* lp)
 /*
  * remove temporary files and stacks
  */
-
 void	sh_freeup(void)
 {
 	if(sh.st.staklist)
@@ -520,7 +518,6 @@ void	sh_freeup(void)
  * decrease reference count for each stack in function list when flag<=0
  * stack is freed when reference count is zero
  */
-
 void sh_funstaks(register struct slnod *slp,int flag)
 {
 	register struct slnod *slpold;
@@ -542,7 +539,6 @@ void sh_funstaks(register struct slnod *slp,int flag)
  *	list & [ cmd ]
  *	list [ ; cmd ]
  */
-
 static Shnode_t	*sh_cmd(Lex_t *lexp, register int sym, int flag)
 {
 	register Shnode_t	*left, *right;
@@ -1199,7 +1195,6 @@ static struct argnod *assign(Lex_t *lexp, register struct argnod *ap, int type)
  *	case ... in ... esac
  *	begin ... end
  */
-
 static Shnode_t	*item(Lex_t *lexp,int flag)
 {
 	register Shnode_t	*t;
@@ -1896,7 +1891,6 @@ static struct ionod	*inout(Lex_t *lexp,struct ionod *lastio,int flag)
 /*
  * convert argument chain to argument list when no special arguments
  */
-
 static struct argnod *qscan(struct comnod *ac,int argn)
 {
 	register char **cp;
diff --git a/src/cmd/ksh93/sh/path.c b/src/cmd/ksh93/sh/path.c
index a91d0c410..9b13f941f 100644
--- a/src/cmd/ksh93/sh/path.c
+++ b/src/cmd/ksh93/sh/path.c
@@ -482,7 +482,6 @@ int	path_open(const char *name, register Pathcomp_t *pp)
 /*
  * given a pathname return the base name
  */
-
 char	*path_basename(register const char *name)
 {
 	register const char *start = name;
@@ -612,7 +611,6 @@ static void funload(int fno, const char *name)
  *   if the matching $PATH entry is '.' or empty, the simple name is written without prefixing the PWD
  * - nothing executable was found
  */
-
 int	path_search(register const char *name,Pathcomp_t **oldpp, int flag)
 {
 	register Namval_t *np;
@@ -927,7 +925,6 @@ err:
 /*
  * Return path relative to present working directory
  */
-
 char *path_relative(register const char* file)
 {
 	register const char *pwd;
@@ -1269,7 +1266,6 @@ pid_t path_spawn(const char *opath,register char **argv, char **envp, Pathcomp_t
  * File is executable but not machine code.
  * Assume file is a shell script and execute it.
  */
-
 static noreturn void exscript(register char *path,register char *argv[],char **envp)
 {
 	register Sfio_t *sp;
@@ -1387,8 +1383,8 @@ static noreturn void exscript(register char *path,register char *argv[],char **e
 	SHACCT = getenv("SHACCT");
     }
     /*
-    * suspend accounting until turned on by sh_accbegin()
-    */
+     * suspend accounting until turned on by sh_accbegin()
+     */
     void sh_accsusp(void)
     {
 	shaccton=0;
@@ -1459,8 +1455,6 @@ static noreturn void exscript(register char *path,register char *argv[],char **e
     }
 #endif	/* SHOPT_ACCT */
 
-
-
 /*
  * add a path component to the path search list and eliminate duplicates
  * and non-existing absolute paths.
diff --git a/src/cmd/ksh93/sh/streval.c b/src/cmd/ksh93/sh/streval.c
index cac01d6fd..252ffbaac 100644
--- a/src/cmd/ksh93/sh/streval.c
+++ b/src/cmd/ksh93/sh/streval.c
@@ -564,7 +564,6 @@ static int gettok(register struct vars *vp)
 /*   
  * evaluate a subexpression with precedence
  */
-
 static int expr(register struct vars *vp,register int precedence)
 {
 	register int	c, op;
@@ -943,7 +942,6 @@ Arith_t *arith_compile(const char *string,char **last,Sfdouble_t(*fun)(const cha
  *
  * NOTE: (*convert)() may call arith_strval()
  */
-
 Sfdouble_t arith_strval(const char *s, char **end, Sfdouble_t(*convert)(const char**,struct lval*,int,Sfdouble_t), int emode)
 {
 	Arith_t *ep;
diff --git a/src/cmd/ksh93/sh/string.c b/src/cmd/ksh93/sh/string.c
index 59c455549..582f1fc07 100644
--- a/src/cmd/ksh93/sh/string.c
+++ b/src/cmd/ksh93/sh/string.c
@@ -45,7 +45,6 @@
  *  <table> is searched for string <sp> and corresponding value is returned
  *  This is only used for small tables and is used to save non-shareable memory
  */
-
 const Shtable_t *sh_locate(register const char *sp,const Shtable_t *table,int size)
 {
 	register int			first;
@@ -230,7 +229,6 @@ found:
  * TRIM(sp)
  * Remove escape characters from characters in <sp> and eliminate quoted nulls.
  */
-
 void	sh_trim(register char *sp)
 /*@
 	assume sp!=NULL;
@@ -267,7 +265,6 @@ void	sh_trim(register char *sp)
  * <str2> must be big enough to hold <str1>
  * <str1> and <str2> may point to the same place.
  */
-
 void sh_utol(register char const *str1,register char *str2)
 /*@
 	assume str1!=0 && str2!=0
diff --git a/src/cmd/ksh93/sh/subshell.c b/src/cmd/ksh93/sh/subshell.c
index 8e66dfe9b..e0bab0842 100644
--- a/src/cmd/ksh93/sh/subshell.c
+++ b/src/cmd/ksh93/sh/subshell.c
@@ -471,7 +471,6 @@ void sh_subjobcheck(pid_t pid)
  * If comsub is not null, the return value will be a stream consisting of
  * output of command <t>.  Otherwise, NULL will be returned.
  */
-
 Sfio_t *sh_subshell(Shnode_t *t, volatile int flags, int comsub)
 {
 	struct subshell sub_data;
diff --git a/src/cmd/ksh93/sh/suid_exec.c b/src/cmd/ksh93/sh/suid_exec.c
index 313840416..a1f2fe6c7 100644
--- a/src/cmd/ksh93/sh/suid_exec.c
+++ b/src/cmd/ksh93/sh/suid_exec.c
@@ -258,7 +258,6 @@ exec:
 /*
  * return true if shell ends in sh or ksh
  */
-
 static int endsh(register const char *shell)
 {
 	while(*shell)
@@ -276,7 +275,6 @@ static int endsh(register const char *shell)
 /*
  * return true if shell is in <dir> directory
  */
-
 static int in_dir(register const char *dir,register const char *shell)
 {
 	while(*dir)
@@ -298,7 +296,6 @@ static void error_exit(const char *message)
 /*
  * This version of access checks against effective UID and effective GID
  */
-
 int eaccess(register const char *name, register int mode)
 {	
 	struct stat statb;
@@ -374,7 +371,6 @@ static void setids(int mode,int owner,int group)
  * Finally, the clone is exec'd.  This file is unlinked by a grandchild
  * of this program, who waits around until the text is free.
  */
-
 static void setids(int mode,uid_t owner,gid_t group)
 {
 	register int n,m;
@@ -485,7 +481,6 @@ static void setids(int mode,uid_t owner,gid_t group)
 /*
  * create a unique name into the <template>
  */
-
 static void maketemp(char *template)
 {
 	register char *cp = template;
@@ -503,7 +498,6 @@ static void maketemp(char *template)
 /*
  *  copy THISPROG into the open file number <fdo> and close <fdo>
  */
-
 static int mycopy(int fdi, int fdo)
 {
 	char buffer[BLKSIZE];
diff --git a/src/cmd/ksh93/sh/waitevent.c b/src/cmd/ksh93/sh/waitevent.c
index d16dbfa24..088a9770e 100644
--- a/src/cmd/ksh93/sh/waitevent.c
+++ b/src/cmd/ksh93/sh/waitevent.c
@@ -26,8 +26,6 @@
  *  waiting for job completion.
  *  The previous waitevent hook function is returned
  */
-
-
 void	*sh_waitnotify(int(*newevent)(int,long,int))
 {
 	int (*old)(int,long,int);
diff --git a/src/cmd/ksh93/sh/xec.c b/src/cmd/ksh93/sh/xec.c
index fdc2b9402..f0ccc7ea0 100644
--- a/src/cmd/ksh93/sh/xec.c
+++ b/src/cmd/ksh93/sh/xec.c
@@ -2802,7 +2802,6 @@ int sh_run(int argn, char *argv[])
 /*
  * print out the command line if set -x is on
  */
-
 int sh_trace(register char *argv[], register int nl)
 {
 	if(sh_isoption(SH_XTRACE))
@@ -2867,7 +2866,6 @@ int sh_trace(register char *argv[], register int nl)
  * Traps are reset by the child
  * The process-id of the child is returned to the parent, 0 to the child.
  */
-
 static void timed_out(void *handle)
 {
 	NOT_USED(handle);
diff --git a/src/cmd/ksh93/tests/attributes.sh b/src/cmd/ksh93/tests/attributes.sh
index 0c1652bcd..ff5829e4a 100755
--- a/src/cmd/ksh93/tests/attributes.sh
+++ b/src/cmd/ksh93/tests/attributes.sh
@@ -499,6 +499,10 @@ export foo
 
 # ======
 # unset exported readonly variables, combined with all other possible attributes
+(
+### begin subshell
+ulimit -t unlimited 2>/dev/null # run in forked subshell to be crash-proof
+Errors=0
 typeset -A expect=(
 	[a]='typeset -x -r -a foo'
 	[b]='typeset -x -r -b foo'
@@ -552,7 +556,13 @@ do	unset foo
 			"expected $(printf %q "${expect[$flag]}"), got $(printf %q "$actual")"
 	fi
 done
-unset expect
+exit "$Errors"
+### end subshell
+)
+if let "(e=$?) > 128"
+then	err_exit "typeset -x -r test crashed with SIG$(kill -l "$e")"
+else	let "Errors += e"
+fi
 
 unset base
 for base in 0 1 65
@@ -592,6 +602,10 @@ got=$(< $tmpfile)
 # Combining -u with -F or -E caused an incorrect variable type
 # https://github.com/ksh93/ksh/pull/163
 # Allow the last numeric type to win out
+(
+### begin subshell
+ulimit -t unlimited 2>/dev/null # run in forked subshell to be crash-proof
+Errors=0
 typeset -A expect=(
 	[uF]='typeset -F a=2.0000000000'
 	[Fu]='typeset -F a=2.0000000000'
@@ -632,6 +646,14 @@ unset expect
 
 [[ $(typeset -iX12 -s a=2; typeset -p a) == 'typeset -X 12 a=0x1.000000000000p+1' ]] || err_exit "typeset -iX12 -s failed to become typeset -X 12 a=0x1.000000000000p+1."
 
+exit "$Errors"
+### end subshell
+)
+if let "(e=$?) > 128"
+then	err_exit "typeset int+float test crashed with SIG$(kill -l "$e")"
+else	let "Errors += e"
+fi
+
 # ======
 # Bug introduced in 0e4c4d61: could not alter the size of an existing justified string attribute
 # https://github.com/ksh93/ksh/issues/142#issuecomment-780931533
diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh
index 76a59c174..a37bb6a28 100755
--- a/src/cmd/ksh93/tests/builtins.sh
+++ b/src/cmd/ksh93/tests/builtins.sh
@@ -867,6 +867,7 @@ PATH=$save_PATH
 
 # ======
 # These are the regression tests for the whence builtin's '-t' flag
+((.sh.version >= 20211227)) &&
 for w in 'whence -t' 'type -t' 'whence -t -v'; do
 	exp=file
 	got=$($w $SHELL)
@@ -1428,6 +1429,7 @@ got="$($SHELL -i "$hist_error_leak" 2>&1)"
 
 # ======
 # printf -v works as of 2021-11-18
+((.sh.version >= 20211118)) && {
 integer ver=.sh.version
 exp=ok$'\f'0000$ver$'\n'
 printf -v got 'ok\f%012d\n' $ver 2>/dev/null
@@ -1438,6 +1440,7 @@ printf -v 'got[1][two][3]' 'ok\f%012d\n' $ver 2>/dev/null
 [[ ${got[1]["two"][3]} == "$exp" ]] || err_exit "printf -v not working with array subscripts" \
 	"(expected $(printf %q "$exp"), got $(printf %q "$got"))"
 unset got ver
+}
 
 # ======
 # The rm builtin's -d option should remove files and empty directories without
@@ -1491,45 +1494,63 @@ fi
 # ======
 # These are regression tests for the cd command's -e and -P flags
 mkdir -p "$tmp/failpwd"
-ln -s "$tmp/failpwd" "$tmp/failpwd1"
-cd "$tmp/failpwd1"
-rm ../failpwd1
+cd "$tmp/failpwd"
+"$SHELL" -c 'cd /; exec rmdir "$1"' x "$tmp/failpwd"
 cd -P .
 got=$?; exp=0
 (( got == exp )) || err_exit "cd -P without -e exits with error status if \$PWD doesn't exist (expected $exp, got $got)"
-cd -eP .
-got=$?; exp=1
-(( got == exp )) || err_exit "cd -eP doesn't fail if \$PWD doesn't exist (expected $exp, got $got)"
+if ((.sh.version >= 20211205))
+then
+	cd -eP .
+	got=$?; exp=1
+	(( got == exp )) || err_exit "cd -eP doesn't fail if \$PWD doesn't exist (expected $exp, got $got)"
+fi
+
 cd "$tmp"
 cd -P "$tmp/notadir" >/dev/null 2>&1
 got=$?; exp=1
 (( got == exp )) || err_exit "cd -P without -e fails with wrong exit status on nonexistent dir (expected $exp, got $got)"
-cd -eP "$tmp/notadir" >/dev/null 2>&1
-got=$?; exp=2
-(( got == exp )) || err_exit "cd -eP fails with wrong exit status on nonexistent dir (expected $exp, got $got)"
+if ((.sh.version >= 20211205))
+then
+	cd -eP "$tmp/notadir" >/dev/null 2>&1
+	got=$?; exp=2
+	(( got == exp )) || err_exit "cd -eP fails with wrong exit status on nonexistent dir (expected $exp, got $got)"
+fi
+
 OLDPWD="$tmp/baddir"
 cd -P - >/dev/null 2>&1
 got=$?; exp=1
 (( got == exp )) || err_exit "cd -P without -e fails with wrong exit status on \$OLDPWD (expected $exp, got $got)"
-cd -eP - >/dev/null 2>&1
-got=$?; exp=2
-(( got == exp )) || err_exit "cd -eP fails with wrong exit status on \$OLDPWD (expected $exp, got $got)"
+if ((.sh.version >= 20211205))
+then
+	cd -eP - >/dev/null 2>&1
+	got=$?; exp=2
+	(( got == exp )) || err_exit "cd -eP fails with wrong exit status on \$OLDPWD (expected $exp, got $got)"
+fi
 cd "$tmp" || err_exit "couldn't change directory from nonexistent dir"
+
 (set -o restricted; cd -P /) >/dev/null 2>&1
 got=$?; exp=1
 (( got == exp )) || err_exit "cd -P in restricted shell has wrong exit status (expected $exp, got $got)"
-(set -o restricted; cd -eP /) >/dev/null 2>&1
-got=$?; exp=2
-(( got == exp )) || err_exit "cd -eP in restricted shell has wrong exit status (expected $exp, got $got)"
-(set -o restricted; cd -?) >/dev/null 2>&1
+if ((.sh.version >= 20211205))
+then
+	(set -o restricted; cd -eP /) >/dev/null 2>&1
+	got=$?; exp=2
+	(( got == exp )) || err_exit "cd -eP in restricted shell has wrong exit status (expected $exp, got $got)"
+fi
+(set -o restricted; cd -\?) >/dev/null 2>&1
 got=$?; exp=1
-(( got == exp )) || err_exit "cd -? shows usage info in restricted shell and has wrong exit status (expected $exp, got $got)"
+(( got == exp )) || err_exit "cd -\\? shows usage info in restricted shell and has wrong exit status (expected $exp, got $got)"
+
 (cd -P '') >/dev/null 2>&1
 got=$?; exp=1
 (( got == exp )) || err_exit "cd -P to empty string has wrong exit status (expected $exp, got $got)"
-(cd -eP '') >/dev/null 2>&1
-got=$?; exp=2
-(( got == exp )) || err_exit "cd -eP to empty string has wrong exit status (expected $exp, got $got)"
+if ((.sh.version >= 20211205))
+then
+	(cd -eP '') >/dev/null 2>&1
+	got=$?; exp=2
+	(( got == exp )) || err_exit "cd -eP to empty string has wrong exit status (expected $exp, got $got)"
+fi
 
 # ======
 # The head and tail builtins should work on files without newlines
diff --git a/src/cmd/ksh93/tests/comvar.sh b/src/cmd/ksh93/tests/comvar.sh
index c2128ec4a..a6a4b20c7 100755
--- a/src/cmd/ksh93/tests/comvar.sh
+++ b/src/cmd/ksh93/tests/comvar.sh
@@ -22,8 +22,7 @@
 . "${SHTESTS_COMMON:-${0%/*}/_common}"
 
 # regression tests for compound variables
-Command=${0##*/}
-integer Errors=0
+
 Point=(
 	float x=1. y=0.
 )
diff --git a/src/cmd/ksh93/tests/comvario.sh b/src/cmd/ksh93/tests/comvario.sh
index 82b0d8d61..485a767a0 100755
--- a/src/cmd/ksh93/tests/comvario.sh
+++ b/src/cmd/ksh93/tests/comvario.sh
@@ -22,10 +22,7 @@
 
 . "${SHTESTS_COMMON:-${0%/*}/_common}"
 
-# "nounset" disabled for now
-#set -o nounset
-Command=${0##*/}
-integer Errors=0 HAVE_signbit=0
+typeset -is HAVE_signbit=0
 
 if	typeset -f .sh.math.signbit >/dev/null && (( signbit(-NaN) ))
 then	HAVE_signbit=1
diff --git a/src/cmd/ksh93/tests/io.sh b/src/cmd/ksh93/tests/io.sh
index a77f11742..0fb31811d 100755
--- a/src/cmd/ksh93/tests/io.sh
+++ b/src/cmd/ksh93/tests/io.sh
@@ -954,6 +954,7 @@ got=$(
 [[ $got == 'test' ]] || err_exit "issue 161 hypothetical bug 2" \
 	"(expected 'test', got $(printf %q "$got"))"
 got=$(
+	set +x
 	exec 4>&1
 	foo=${ { redirect 4>&1; } 6<&2 4<&-; }
 	echo "test" >&4 # => 4: cannot open [Bad file descriptor]
diff --git a/src/lib/libast/Mamfile b/src/lib/libast/Mamfile
index f6930f03a..0a0285b7f 100644
--- a/src/lib/libast/Mamfile
+++ b/src/lib/libast/Mamfile
@@ -30,7 +30,7 @@ make install
 						done features/standards
 						exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/standards
 					done FEATURE/standards generated
-					exec - cmp 2>/dev/null -s FEATURE/standards ast_standards.h || { rm -f ast_standards.h; ${STDCP} FEATURE/standards ast_standards.h; }
+					exec - cmp -s FEATURE/standards ast_standards.h || { rm -f ast_standards.h; ${STDCP} FEATURE/standards ast_standards.h; }
 				done ast_standards.h generated
 				make FEATURE/lib
 					meta FEATURE/lib features/%>FEATURE/% features/lib lib
@@ -54,7 +54,7 @@ make install
 							make ast_common.h implicit
 								prev FEATURE/common
 								exec - sed '/define _def_map_ast/d' < FEATURE/common > 1.${COTEMP}.x
-								exec - if cmp 2>/dev/null -s ast_common.h 1.${COTEMP}.x
+								exec - if cmp -s ast_common.h 1.${COTEMP}.x
 								exec - then rm -f 1.${COTEMP}.x
 								exec - else mv 1.${COTEMP}.x ast_common.h
 								exec - fi
@@ -97,7 +97,7 @@ make install
 										done features/map.c
 										exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I.  ${LDFLAGS}" run features/map.c
 									done FEATURE/map generated
-									exec - cmp 2>/dev/null -s FEATURE/map ast_map.h || { rm -f ast_map.h; silent test -d . || mkdir .; ${STDCP} FEATURE/map ast_map.h; }
+									exec - cmp -s FEATURE/map ast_map.h || { rm -f ast_map.h; silent test -d . || mkdir .; ${STDCP} FEATURE/map ast_map.h; }
 								done ast_map.h dontcare generated
 							done ast_common.h dontcare generated
 						done std/bytesex.h dontcare
@@ -177,7 +177,7 @@ make install
 						done features/limits.c
 						exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  ${LDFLAGS}" run features/limits.c
 					done FEATURE/limits generated
-					exec - cmp 2>/dev/null -s FEATURE/limits ast_limits.h || { rm -f ast_limits.h; silent test -d . || mkdir .; ${STDCP} FEATURE/limits ast_limits.h; }
+					exec - cmp -s FEATURE/limits ast_limits.h || { rm -f ast_limits.h; silent test -d . || mkdir .; ${STDCP} FEATURE/limits ast_limits.h; }
 				done ast_limits.h generated
 				make ast_stdio.h
 					make FEATURE/stdio
@@ -191,7 +191,7 @@ make install
 							make include/regex.h implicit
 								make ast_api.h implicit
 									prev FEATURE/api
-									exec - cmp 2>/dev/null -s FEATURE/api ast_api.h || { rm -f ast_api.h; silent test -d . || mkdir .; ${STDCP} FEATURE/api ast_api.h; }
+									exec - cmp -s FEATURE/api ast_api.h || { rm -f ast_api.h; silent test -d . || mkdir .; ${STDCP} FEATURE/api ast_api.h; }
 								done ast_api.h dontcare generated
 								make ast_wchar.h implicit
 									make FEATURE/wchar
@@ -212,7 +212,7 @@ make install
 														prev ast_wchar.h implicit
 													done std/wchar.h dontcare
 												done FEATURE/wctype generated
-												exec - cmp 2>/dev/null -s FEATURE/wctype ast_wctype.h || { rm -f ast_wctype.h; silent test -d . || mkdir .; ${STDCP} FEATURE/wctype ast_wctype.h; }
+												exec - cmp -s FEATURE/wctype ast_wctype.h || { rm -f ast_wctype.h; silent test -d . || mkdir .; ${STDCP} FEATURE/wctype ast_wctype.h; }
 											done ast_wctype.h dontcare generated
 										done std/wctype.h dontcare
 										make std/stdio.h implicit
@@ -221,7 +221,7 @@ make install
 										prev std/stdio.h implicit
 										prev ast_common.h implicit
 									done FEATURE/wchar generated
-									exec - cmp 2>/dev/null -s FEATURE/wchar ast_wchar.h || { rm -f ast_wchar.h; silent test -d . || mkdir .; ${STDCP} FEATURE/wchar ast_wchar.h; }
+									exec - cmp -s FEATURE/wchar ast_wchar.h || { rm -f ast_wchar.h; silent test -d . || mkdir .; ${STDCP} FEATURE/wchar ast_wchar.h; }
 									prev std/stdio.h implicit
 									prev ast_common.h implicit
 								done ast_wchar.h dontcare generated
@@ -245,7 +245,7 @@ make install
 									done features/botch.c
 									exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  ${LDFLAGS}" run features/botch.c
 								done FEATURE/botch generated
-								exec - cmp 2>/dev/null -s FEATURE/botch ast_botch.h || { rm -f ast_botch.h; silent test -d . || mkdir .; ${STDCP} FEATURE/botch ast_botch.h; }
+								exec - cmp -s FEATURE/botch ast_botch.h || { rm -f ast_botch.h; silent test -d . || mkdir .; ${STDCP} FEATURE/botch ast_botch.h; }
 							done ast_botch.h dontcare generated
 							prev ast_limits.h implicit
 							make ast_fcntl.h implicit
@@ -270,26 +270,26 @@ make install
 									exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  ${LDFLAGS}" run features/fcntl.c
 									make ast_fs.h implicit
 										prev FEATURE/fs
-										exec - cmp 2>/dev/null -s FEATURE/fs ast_fs.h || { rm -f ast_fs.h; silent test -d . || mkdir .; ${STDCP} FEATURE/fs ast_fs.h; }
+										exec - cmp -s FEATURE/fs ast_fs.h || { rm -f ast_fs.h; silent test -d . || mkdir .; ${STDCP} FEATURE/fs ast_fs.h; }
 									done ast_fs.h dontcare generated
 								done FEATURE/fcntl generated
-								exec - cmp 2>/dev/null -s FEATURE/fcntl ast_fcntl.h || { rm -f ast_fcntl.h; silent test -d . || mkdir .; ${STDCP} FEATURE/fcntl ast_fcntl.h; }
+								exec - cmp -s FEATURE/fcntl ast_fcntl.h || { rm -f ast_fcntl.h; silent test -d . || mkdir .; ${STDCP} FEATURE/fcntl ast_fcntl.h; }
 								prev ast_fs.h implicit
 							done ast_fcntl.h dontcare generated
 							prev include/ast_getopt.h implicit
 							make ast_sys.h implicit
 								prev FEATURE/sys
-								exec - cmp 2>/dev/null -s FEATURE/sys ast_sys.h || { rm -f ast_sys.h; silent test -d . || mkdir .; ${STDCP} FEATURE/sys ast_sys.h; }
+								exec - cmp -s FEATURE/sys ast_sys.h || { rm -f ast_sys.h; silent test -d . || mkdir .; ${STDCP} FEATURE/sys ast_sys.h; }
 							done ast_sys.h dontcare generated
 							make ast_lib.h implicit
 								prev FEATURE/lib
-								exec - cmp 2>/dev/null -s FEATURE/lib ast_lib.h || { rm -f ast_lib.h; silent test -d . || mkdir .; ${STDCP} FEATURE/lib ast_lib.h; }
+								exec - cmp -s FEATURE/lib ast_lib.h || { rm -f ast_lib.h; silent test -d . || mkdir .; ${STDCP} FEATURE/lib ast_lib.h; }
 							done ast_lib.h dontcare generated
 							prev ast_common.h implicit
 							prev ast_standards.h implicit
 						done include/ast_std.h dontcare
 					done FEATURE/stdio generated
-					exec - cmp 2>/dev/null -s FEATURE/stdio ast_stdio.h || { rm -f ast_stdio.h; silent test -d . || mkdir .; ${STDCP} FEATURE/stdio ast_stdio.h; }
+					exec - cmp -s FEATURE/stdio ast_stdio.h || { rm -f ast_stdio.h; silent test -d . || mkdir .; ${STDCP} FEATURE/stdio ast_stdio.h; }
 					prev include/sfio_s.h implicit
 					prev include/ast_std.h implicit
 				done ast_stdio.h dontcare generated
@@ -300,7 +300,7 @@ make install
 						done features/nl_types
 						exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/nl_types
 					done FEATURE/nl_types generated
-					exec - cmp 2>/dev/null -s FEATURE/nl_types ast_nl_types.h || { rm -f ast_nl_types.h; silent test -d . || mkdir .; ${STDCP} FEATURE/nl_types ast_nl_types.h; }
+					exec - cmp -s FEATURE/nl_types ast_nl_types.h || { rm -f ast_nl_types.h; silent test -d . || mkdir .; ${STDCP} FEATURE/nl_types ast_nl_types.h; }
 				done ast_nl_types.h generated
 				prev ast_wchar.h
 				prev ast_wctype.h
@@ -404,7 +404,7 @@ make install
 						done direntry.h dontcare virtual
 						make ast_param.h implicit
 							prev FEATURE/param
-							exec - cmp 2>/dev/null -s FEATURE/param ast_param.h || { rm -f ast_param.h; silent test -d . || mkdir .; ${STDCP} FEATURE/param ast_param.h; }
+							exec - cmp -s FEATURE/param ast_param.h || { rm -f ast_param.h; silent test -d . || mkdir .; ${STDCP} FEATURE/param ast_param.h; }
 						done ast_param.h dontcare generated
 						make std/dirent.h implicit
 							make ast_dirent.h implicit
@@ -415,7 +415,7 @@ make install
 									exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/dirent
 									prev include/ast_std.h implicit
 								done FEATURE/dirent generated
-								exec - cmp 2>/dev/null -s FEATURE/dirent ast_dirent.h || { rm -f ast_dirent.h; silent test -d . || mkdir .; ${STDCP} FEATURE/dirent ast_dirent.h; }
+								exec - cmp -s FEATURE/dirent ast_dirent.h || { rm -f ast_dirent.h; silent test -d . || mkdir .; ${STDCP} FEATURE/dirent ast_dirent.h; }
 								prev include/ast_std.h implicit
 							done ast_dirent.h dontcare generated
 						done std/dirent.h dontcare
@@ -433,7 +433,7 @@ make install
 									done features/mode.c
 									exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -Iinclude -Istd  ${LDFLAGS}" run features/mode.c
 								done FEATURE/mode generated
-								exec - cmp 2>/dev/null -s FEATURE/mode ast_mode.h || { rm -f ast_mode.h; silent test -d . || mkdir .; ${STDCP} FEATURE/mode ast_mode.h; }
+								exec - cmp -s FEATURE/mode ast_mode.h || { rm -f ast_mode.h; silent test -d . || mkdir .; ${STDCP} FEATURE/mode ast_mode.h; }
 							done ast_mode.h dontcare generated
 							prev ast_fs.h implicit
 							prev include/ast_std.h implicit
@@ -660,7 +660,7 @@ make install
 								done features/ccode
 								exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/ccode
 							done FEATURE/ccode generated
-							exec - cmp 2>/dev/null -s FEATURE/ccode ast_ccode.h || { rm -f ast_ccode.h; silent test -d . || mkdir .; ${STDCP} FEATURE/ccode ast_ccode.h; }
+							exec - cmp -s FEATURE/ccode ast_ccode.h || { rm -f ast_ccode.h; silent test -d . || mkdir .; ${STDCP} FEATURE/ccode ast_ccode.h; }
 						done ast_ccode.h dontcare generated
 						prev ast_common.h implicit
 					done include/ccode.h
@@ -965,7 +965,7 @@ make install
 								done features/time
 								exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/time
 							done FEATURE/time generated
-							exec - cmp 2>/dev/null -s FEATURE/time ast_time.h || { rm -f ast_time.h; silent test -d . || mkdir .; ${STDCP} FEATURE/time ast_time.h; }
+							exec - cmp -s FEATURE/time ast_time.h || { rm -f ast_time.h; silent test -d . || mkdir .; ${STDCP} FEATURE/time ast_time.h; }
 						done ast_time.h dontcare generated
 						prev include/ast.h implicit
 					done include/times.h
@@ -1001,11 +1001,11 @@ make install
 							make port/lc.tab
 							done port/lc.tab
 							exec - ./lcgen ${COTEMP}.1 ${COTEMP}.2 < port/lc.tab
-							exec - if cmp 2>/dev/null -s ${COTEMP}.1 lc.h
+							exec - if cmp -s ${COTEMP}.1 lc.h
 							exec - then rm ${COTEMP}.1
 							exec - else mv ${COTEMP}.1 lc.h
 							exec - fi
-							exec - if cmp 2>/dev/null -s ${COTEMP}.2 lctab.c
+							exec - if cmp -s ${COTEMP}.2 lctab.c
 							exec - then rm ${COTEMP}.2
 							exec - else mv ${COTEMP}.2 lctab.c
 							exec - fi
@@ -1054,7 +1054,7 @@ make install
 							done features/preroot.sh
 							exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/preroot.sh
 						done FEATURE/preroot generated
-						exec - cmp 2>/dev/null -s FEATURE/preroot preroot.h || { rm -f preroot.h; silent test -d . || mkdir .; ${STDCP} FEATURE/preroot preroot.h; }
+						exec - cmp -s FEATURE/preroot preroot.h || { rm -f preroot.h; silent test -d . || mkdir .; ${STDCP} FEATURE/preroot preroot.h; }
 					done preroot.h generated
 					prev include/ast.h implicit
 				done path/pathkey.c
@@ -1118,7 +1118,7 @@ make install
 							exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/tv
 							prev include/ast.h implicit
 						done FEATURE/tv generated
-						exec - cmp 2>/dev/null -s FEATURE/tv tv.h || { rm -f tv.h; silent test -d . || mkdir .; ${STDCP} FEATURE/tv tv.h; }
+						exec - cmp -s FEATURE/tv tv.h || { rm -f tv.h; silent test -d . || mkdir .; ${STDCP} FEATURE/tv tv.h; }
 						prev include/ast.h implicit
 					done tv.h generated
 					prev include/ls.h implicit
@@ -1400,7 +1400,7 @@ make install
 							done features/sig.sh
 							exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/sig.sh
 						done FEATURE/sig generated
-						exec - cmp 2>/dev/null -s FEATURE/sig sig.h || { rm -f sig.h; silent test -d . || mkdir .; ${STDCP} FEATURE/sig sig.h; }
+						exec - cmp -s FEATURE/sig sig.h || { rm -f sig.h; silent test -d . || mkdir .; ${STDCP} FEATURE/sig sig.h; }
 					done sig.h generated
 					prev include/ast.h implicit
 				done misc/signal.c
@@ -1518,7 +1518,7 @@ make install
 								prev include/ccode.h implicit
 								prev ast_common.h implicit
 							done FEATURE/iconv generated
-							exec - cmp 2>/dev/null -s FEATURE/iconv ast_iconv.h || { rm -f ast_iconv.h; silent test -d . || mkdir .; ${STDCP} FEATURE/iconv ast_iconv.h; }
+							exec - cmp -s FEATURE/iconv ast_iconv.h || { rm -f ast_iconv.h; silent test -d . || mkdir .; ${STDCP} FEATURE/iconv ast_iconv.h; }
 							prev include/ccode.h implicit
 							prev ast_common.h implicit
 						done ast_iconv.h generated
@@ -1604,7 +1604,7 @@ make install
 						prev include/ls.h implicit
 						make ast_tty.h implicit
 							prev FEATURE/tty
-							exec - cmp 2>/dev/null -s FEATURE/tty ast_tty.h || { rm -f ast_tty.h; silent test -d . || mkdir .; ${STDCP} FEATURE/tty ast_tty.h; }
+							exec - cmp -s FEATURE/tty ast_tty.h || { rm -f ast_tty.h; silent test -d . || mkdir .; ${STDCP} FEATURE/tty ast_tty.h; }
 						done ast_tty.h dontcare generated
 						prev ast_time.h implicit
 						prev include/ast.h implicit
@@ -1893,7 +1893,7 @@ make install
 							prev tv.h implicit
 							prev include/tm.h implicit
 						done FEATURE/tmx generated
-						exec - cmp 2>/dev/null -s FEATURE/tmx tmx.h || { rm -f tmx.h; silent test -d . || mkdir .; ${STDCP} FEATURE/tmx tmx.h; }
+						exec - cmp -s FEATURE/tmx tmx.h || { rm -f tmx.h; silent test -d . || mkdir .; ${STDCP} FEATURE/tmx tmx.h; }
 						prev tv.h implicit
 						prev include/tm.h implicit
 					done tmx.h generated
@@ -1993,7 +1993,7 @@ make install
 							done features/align.c
 							exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I.  ${LDFLAGS}" run features/align.c
 						done FEATURE/align generated
-						exec - cmp 2>/dev/null -s FEATURE/align align.h || { rm -f align.h; silent test -d . || mkdir .; ${STDCP} FEATURE/align align.h; }
+						exec - cmp -s FEATURE/align align.h || { rm -f align.h; silent test -d . || mkdir .; ${STDCP} FEATURE/align align.h; }
 					done align.h generated
 					prev include/ast.h implicit
 					prev include/sfio_t.h implicit
@@ -2093,7 +2093,7 @@ make install
 									done features/wait
 									exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/wait
 								done FEATURE/wait generated
-								exec - cmp 2>/dev/null -s FEATURE/wait ast_wait.h || { rm -f ast_wait.h; silent test -d . || mkdir .; ${STDCP} FEATURE/wait ast_wait.h; }
+								exec - cmp -s FEATURE/wait ast_wait.h || { rm -f ast_wait.h; silent test -d . || mkdir .; ${STDCP} FEATURE/wait ast_wait.h; }
 							done ast_wait.h dontcare generated
 							prev include/ast.h implicit
 						done include/wait.h dontcare
@@ -2983,7 +2983,7 @@ make install
 							done features/vfork
 							exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/vfork
 						done FEATURE/vfork generated
-						exec - cmp 2>/dev/null -s FEATURE/vfork ast_vfork.h || { rm -f ast_vfork.h; silent test -d . || mkdir .; ${STDCP} FEATURE/vfork ast_vfork.h; }
+						exec - cmp -s FEATURE/vfork ast_vfork.h || { rm -f ast_vfork.h; silent test -d . || mkdir .; ${STDCP} FEATURE/vfork ast_vfork.h; }
 					done ast_vfork.h dontcare generated
 					prev ast_tty.h implicit
 					prev sig.h implicit
@@ -3501,7 +3501,7 @@ make install
 						make comp/syslog.h implicit
 							make ast_namval.h implicit
 								prev include/namval.h
-								exec - cmp 2>/dev/null -s include/namval.h ast_namval.h || { rm -f ast_namval.h; silent test -d . || mkdir .; ${STDCP} include/namval.h ast_namval.h; }
+								exec - cmp -s include/namval.h ast_namval.h || { rm -f ast_namval.h; silent test -d . || mkdir .; ${STDCP} include/namval.h ast_namval.h; }
 							done ast_namval.h dontcare generated
 						done comp/syslog.h dontcare
 					done comp/sysloglib.h dontcare
@@ -5492,7 +5492,7 @@ make install
 					prev include/ls.h implicit
 					make ast_mmap.h implicit
 						prev FEATURE/mmap
-						exec - cmp 2>/dev/null -s FEATURE/mmap ast_mmap.h || { rm -f ast_mmap.h; silent test -d . || mkdir .; ${STDCP} FEATURE/mmap ast_mmap.h; }
+						exec - cmp -s FEATURE/mmap ast_mmap.h || { rm -f ast_mmap.h; silent test -d . || mkdir .; ${STDCP} FEATURE/mmap ast_mmap.h; }
 					done ast_mmap.h generated
 					prev include/ast.h implicit
 				done port/astcopy.c
@@ -6382,606 +6382,521 @@ make install
 	make ${INSTALLROOT}/include/ast/ast_common.h
 		prev ${INSTALLROOT}/include/ast
 		prev ast_common.h
-		exec - if cmp 2>/dev/null -s ast_common.h ${INSTALLROOT}/include/ast/ast_common.h
-		exec - then :
-		exec - else ${STDCP} ast_common.h ${INSTALLROOT}/include/ast/ast_common.h
+		exec - if ! cmp -s ast_common.h ${INSTALLROOT}/include/ast/ast_common.h
+		exec - then ${STDCP} ast_common.h ${INSTALLROOT}/include/ast/ast_common.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_common.h generated
 	make ${INSTALLROOT}/include/ast/ast.h
 		prev include/ast.h
-		exec - if cmp 2>/dev/null -s include/ast.h ${INSTALLROOT}/include/ast/ast.h
-		exec - then :
-		exec - else ${STDCP} include/ast.h ${INSTALLROOT}/include/ast/ast.h
+		exec - if ! cmp -s include/ast.h ${INSTALLROOT}/include/ast/ast.h
+		exec - then ${STDCP} include/ast.h ${INSTALLROOT}/include/ast/ast.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast.h generated
 	make ${INSTALLROOT}/include/ast/ast_dir.h
 		prev include/ast_dir.h
-		exec - if cmp 2>/dev/null -s include/ast_dir.h ${INSTALLROOT}/include/ast/ast_dir.h
-		exec - then :
-		exec - else ${STDCP} include/ast_dir.h ${INSTALLROOT}/include/ast/ast_dir.h
+		exec - if ! cmp -s include/ast_dir.h ${INSTALLROOT}/include/ast/ast_dir.h
+		exec - then ${STDCP} include/ast_dir.h ${INSTALLROOT}/include/ast/ast_dir.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_dir.h generated
 	make ${INSTALLROOT}/include/ast/ast_getopt.h
 		prev include/ast_getopt.h
-		exec - if cmp 2>/dev/null -s include/ast_getopt.h ${INSTALLROOT}/include/ast/ast_getopt.h
-		exec - then :
-		exec - else ${STDCP} include/ast_getopt.h ${INSTALLROOT}/include/ast/ast_getopt.h
+		exec - if ! cmp -s include/ast_getopt.h ${INSTALLROOT}/include/ast/ast_getopt.h
+		exec - then ${STDCP} include/ast_getopt.h ${INSTALLROOT}/include/ast/ast_getopt.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_getopt.h generated
 	make ${INSTALLROOT}/include/ast/ast_std.h
 		prev include/ast_std.h
-		exec - if cmp 2>/dev/null -s include/ast_std.h ${INSTALLROOT}/include/ast/ast_std.h
-		exec - then :
-		exec - else ${STDCP} include/ast_std.h ${INSTALLROOT}/include/ast/ast_std.h
+		exec - if ! cmp -s include/ast_std.h ${INSTALLROOT}/include/ast/ast_std.h
+		exec - then ${STDCP} include/ast_std.h ${INSTALLROOT}/include/ast/ast_std.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_std.h generated
 	make ${INSTALLROOT}/include/ast/ast_namval.h
 		prev ast_namval.h
-		exec - if cmp 2>/dev/null -s ast_namval.h ${INSTALLROOT}/include/ast/ast_namval.h
-		exec - then :
-		exec - else ${STDCP} ast_namval.h ${INSTALLROOT}/include/ast/ast_namval.h
+		exec - if ! cmp -s ast_namval.h ${INSTALLROOT}/include/ast/ast_namval.h
+		exec - then ${STDCP} ast_namval.h ${INSTALLROOT}/include/ast/ast_namval.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_namval.h generated
 	make ${INSTALLROOT}/include/ast/ast_windows.h
 		prev include/ast_windows.h
-		exec - if cmp 2>/dev/null -s include/ast_windows.h ${INSTALLROOT}/include/ast/ast_windows.h
-		exec - then :
-		exec - else ${STDCP} include/ast_windows.h ${INSTALLROOT}/include/ast/ast_windows.h
+		exec - if ! cmp -s include/ast_windows.h ${INSTALLROOT}/include/ast/ast_windows.h
+		exec - then ${STDCP} include/ast_windows.h ${INSTALLROOT}/include/ast/ast_windows.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_windows.h generated
 	make ${INSTALLROOT}/include/ast/ccode.h
 		prev include/ccode.h
-		exec - if cmp 2>/dev/null -s include/ccode.h ${INSTALLROOT}/include/ast/ccode.h
-		exec - then :
-		exec - else ${STDCP} include/ccode.h ${INSTALLROOT}/include/ast/ccode.h
+		exec - if ! cmp -s include/ccode.h ${INSTALLROOT}/include/ast/ccode.h
+		exec - then ${STDCP} include/ccode.h ${INSTALLROOT}/include/ast/ccode.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ccode.h generated
 	make ${INSTALLROOT}/include/ast/cdt.h
 		prev include/cdt.h
-		exec - if cmp 2>/dev/null -s include/cdt.h ${INSTALLROOT}/include/ast/cdt.h
-		exec - then :
-		exec - else ${STDCP} include/cdt.h ${INSTALLROOT}/include/ast/cdt.h
+		exec - if ! cmp -s include/cdt.h ${INSTALLROOT}/include/ast/cdt.h
+		exec - then ${STDCP} include/cdt.h ${INSTALLROOT}/include/ast/cdt.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/cdt.h generated
 	make ${INSTALLROOT}/include/ast/cdtlib.h
 		prev cdt/cdtlib.h
-		exec - if cmp 2>/dev/null -s cdt/cdtlib.h ${INSTALLROOT}/include/ast/cdtlib.h
-		exec - then :
-		exec - else ${STDCP} cdt/cdtlib.h ${INSTALLROOT}/include/ast/cdtlib.h
+		exec - if ! cmp -s cdt/cdtlib.h ${INSTALLROOT}/include/ast/cdtlib.h
+		exec - then ${STDCP} cdt/cdtlib.h ${INSTALLROOT}/include/ast/cdtlib.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/cdtlib.h generated
 	make ${INSTALLROOT}/include/ast/cmdarg.h
 		prev include/cmdarg.h
-		exec - if cmp 2>/dev/null -s include/cmdarg.h ${INSTALLROOT}/include/ast/cmdarg.h
-		exec - then :
-		exec - else ${STDCP} include/cmdarg.h ${INSTALLROOT}/include/ast/cmdarg.h
+		exec - if ! cmp -s include/cmdarg.h ${INSTALLROOT}/include/ast/cmdarg.h
+		exec - then ${STDCP} include/cmdarg.h ${INSTALLROOT}/include/ast/cmdarg.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/cmdarg.h generated
 	make ${INSTALLROOT}/include/ast/debug.h
 		prev include/debug.h
-		exec - if cmp 2>/dev/null -s include/debug.h ${INSTALLROOT}/include/ast/debug.h
-		exec - then :
-		exec - else ${STDCP} include/debug.h ${INSTALLROOT}/include/ast/debug.h
+		exec - if ! cmp -s include/debug.h ${INSTALLROOT}/include/ast/debug.h
+		exec - then ${STDCP} include/debug.h ${INSTALLROOT}/include/ast/debug.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/debug.h generated
 	make ${INSTALLROOT}/include/ast/dt.h
 		prev include/dt.h
-		exec - if cmp 2>/dev/null -s include/dt.h ${INSTALLROOT}/include/ast/dt.h
-		exec - then :
-		exec - else ${STDCP} include/dt.h ${INSTALLROOT}/include/ast/dt.h
+		exec - if ! cmp -s include/dt.h ${INSTALLROOT}/include/ast/dt.h
+		exec - then ${STDCP} include/dt.h ${INSTALLROOT}/include/ast/dt.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/dt.h generated
 	make ${INSTALLROOT}/include/ast/error.h
 		prev include/error.h
-		exec - if cmp 2>/dev/null -s include/error.h ${INSTALLROOT}/include/ast/error.h
-		exec - then :
-		exec - else ${STDCP} include/error.h ${INSTALLROOT}/include/ast/error.h
+		exec - if ! cmp -s include/error.h ${INSTALLROOT}/include/ast/error.h
+		exec - then ${STDCP} include/error.h ${INSTALLROOT}/include/ast/error.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/error.h generated
 	make ${INSTALLROOT}/include/ast/find.h
 		prev include/find.h
-		exec - if cmp 2>/dev/null -s include/find.h ${INSTALLROOT}/include/ast/find.h
-		exec - then :
-		exec - else ${STDCP} include/find.h ${INSTALLROOT}/include/ast/find.h
+		exec - if ! cmp -s include/find.h ${INSTALLROOT}/include/ast/find.h
+		exec - then ${STDCP} include/find.h ${INSTALLROOT}/include/ast/find.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/find.h generated
 	make ${INSTALLROOT}/include/ast/ftw.h
 		prev comp/ftw.h
-		exec - if cmp 2>/dev/null -s comp/ftw.h ${INSTALLROOT}/include/ast/ftw.h
-		exec - then :
-		exec - else ${STDCP} comp/ftw.h ${INSTALLROOT}/include/ast/ftw.h
+		exec - if ! cmp -s comp/ftw.h ${INSTALLROOT}/include/ast/ftw.h
+		exec - then ${STDCP} comp/ftw.h ${INSTALLROOT}/include/ast/ftw.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ftw.h generated
 	make ${INSTALLROOT}/include/ast/ftwalk.h
 		prev include/ftwalk.h
-		exec - if cmp 2>/dev/null -s include/ftwalk.h ${INSTALLROOT}/include/ast/ftwalk.h
-		exec - then :
-		exec - else ${STDCP} include/ftwalk.h ${INSTALLROOT}/include/ast/ftwalk.h
+		exec - if ! cmp -s include/ftwalk.h ${INSTALLROOT}/include/ast/ftwalk.h
+		exec - then ${STDCP} include/ftwalk.h ${INSTALLROOT}/include/ast/ftwalk.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ftwalk.h generated
 	make ${INSTALLROOT}/include/ast/fts.h
 		prev include/fts.h
-		exec - if cmp 2>/dev/null -s include/fts.h ${INSTALLROOT}/include/ast/fts.h
-		exec - then :
-		exec - else ${STDCP} include/fts.h ${INSTALLROOT}/include/ast/fts.h
+		exec - if ! cmp -s include/fts.h ${INSTALLROOT}/include/ast/fts.h
+		exec - then ${STDCP} include/fts.h ${INSTALLROOT}/include/ast/fts.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/fts.h generated
 	make ${INSTALLROOT}/include/ast/getopt.h
 		prev comp/getopt.h
-		exec - if cmp 2>/dev/null -s comp/getopt.h ${INSTALLROOT}/include/ast/getopt.h
-		exec - then :
-		exec - else ${STDCP} comp/getopt.h ${INSTALLROOT}/include/ast/getopt.h
+		exec - if ! cmp -s comp/getopt.h ${INSTALLROOT}/include/ast/getopt.h
+		exec - then ${STDCP} comp/getopt.h ${INSTALLROOT}/include/ast/getopt.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/getopt.h generated
 	make ${INSTALLROOT}/include/ast/glob.h
 		prev include/glob.h
-		exec - if cmp 2>/dev/null -s include/glob.h ${INSTALLROOT}/include/ast/glob.h
-		exec - then :
-		exec - else ${STDCP} include/glob.h ${INSTALLROOT}/include/ast/glob.h
+		exec - if ! cmp -s include/glob.h ${INSTALLROOT}/include/ast/glob.h
+		exec - then ${STDCP} include/glob.h ${INSTALLROOT}/include/ast/glob.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/glob.h generated
 	make ${INSTALLROOT}/include/ast/hash.h
 		prev include/hash.h
-		exec - if cmp 2>/dev/null -s include/hash.h ${INSTALLROOT}/include/ast/hash.h
-		exec - then :
-		exec - else ${STDCP} include/hash.h ${INSTALLROOT}/include/ast/hash.h
+		exec - if ! cmp -s include/hash.h ${INSTALLROOT}/include/ast/hash.h
+		exec - then ${STDCP} include/hash.h ${INSTALLROOT}/include/ast/hash.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/hash.h generated
 	make ${INSTALLROOT}/include/ast/hashkey.h
 		prev include/hashkey.h
-		exec - if cmp 2>/dev/null -s include/hashkey.h ${INSTALLROOT}/include/ast/hashkey.h
-		exec - then :
-		exec - else ${STDCP} include/hashkey.h ${INSTALLROOT}/include/ast/hashkey.h
+		exec - if ! cmp -s include/hashkey.h ${INSTALLROOT}/include/ast/hashkey.h
+		exec - then ${STDCP} include/hashkey.h ${INSTALLROOT}/include/ast/hashkey.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/hashkey.h generated
 	make ${INSTALLROOT}/include/ast/hashpart.h
 		prev include/hashpart.h
-		exec - if cmp 2>/dev/null -s include/hashpart.h ${INSTALLROOT}/include/ast/hashpart.h
-		exec - then :
-		exec - else ${STDCP} include/hashpart.h ${INSTALLROOT}/include/ast/hashpart.h
+		exec - if ! cmp -s include/hashpart.h ${INSTALLROOT}/include/ast/hashpart.h
+		exec - then ${STDCP} include/hashpart.h ${INSTALLROOT}/include/ast/hashpart.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/hashpart.h generated
 	make ${INSTALLROOT}/include/ast/ip6.h
 		prev include/ip6.h
-		exec - if cmp 2>/dev/null -s include/ip6.h ${INSTALLROOT}/include/ast/ip6.h
-		exec - then :
-		exec - else ${STDCP} include/ip6.h ${INSTALLROOT}/include/ast/ip6.h
+		exec - if ! cmp -s include/ip6.h ${INSTALLROOT}/include/ast/ip6.h
+		exec - then ${STDCP} include/ip6.h ${INSTALLROOT}/include/ast/ip6.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ip6.h generated
 	make ${INSTALLROOT}/include/ast/lc.h
 		prev lc.h
-		exec - if cmp 2>/dev/null -s lc.h ${INSTALLROOT}/include/ast/lc.h
-		exec - then :
-		exec - else ${STDCP} lc.h ${INSTALLROOT}/include/ast/lc.h
+		exec - if ! cmp -s lc.h ${INSTALLROOT}/include/ast/lc.h
+		exec - then ${STDCP} lc.h ${INSTALLROOT}/include/ast/lc.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/lc.h generated
 	make ${INSTALLROOT}/include/ast/ls.h
 		prev include/ls.h
-		exec - if cmp 2>/dev/null -s include/ls.h ${INSTALLROOT}/include/ast/ls.h
-		exec - then :
-		exec - else ${STDCP} include/ls.h ${INSTALLROOT}/include/ast/ls.h
+		exec - if ! cmp -s include/ls.h ${INSTALLROOT}/include/ast/ls.h
+		exec - then ${STDCP} include/ls.h ${INSTALLROOT}/include/ast/ls.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ls.h generated
 	make ${INSTALLROOT}/include/ast/magic.h
 		prev include/magic.h
-		exec - if cmp 2>/dev/null -s include/magic.h ${INSTALLROOT}/include/ast/magic.h
-		exec - then :
-		exec - else ${STDCP} include/magic.h ${INSTALLROOT}/include/ast/magic.h
+		exec - if ! cmp -s include/magic.h ${INSTALLROOT}/include/ast/magic.h
+		exec - then ${STDCP} include/magic.h ${INSTALLROOT}/include/ast/magic.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/magic.h generated
 	make ${INSTALLROOT}/include/ast/mc.h
 		prev include/mc.h
-		exec - if cmp 2>/dev/null -s include/mc.h ${INSTALLROOT}/include/ast/mc.h
-		exec - then :
-		exec - else ${STDCP} include/mc.h ${INSTALLROOT}/include/ast/mc.h
+		exec - if ! cmp -s include/mc.h ${INSTALLROOT}/include/ast/mc.h
+		exec - then ${STDCP} include/mc.h ${INSTALLROOT}/include/ast/mc.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/mc.h generated
 	make ${INSTALLROOT}/include/ast/mime.h
 		prev include/mime.h
-		exec - if cmp 2>/dev/null -s include/mime.h ${INSTALLROOT}/include/ast/mime.h
-		exec - then :
-		exec - else ${STDCP} include/mime.h ${INSTALLROOT}/include/ast/mime.h
+		exec - if ! cmp -s include/mime.h ${INSTALLROOT}/include/ast/mime.h
+		exec - then ${STDCP} include/mime.h ${INSTALLROOT}/include/ast/mime.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/mime.h generated
 	make ${INSTALLROOT}/include/ast/mnt.h
 		prev include/mnt.h
-		exec - if cmp 2>/dev/null -s include/mnt.h ${INSTALLROOT}/include/ast/mnt.h
-		exec - then :
-		exec - else ${STDCP} include/mnt.h ${INSTALLROOT}/include/ast/mnt.h
+		exec - if ! cmp -s include/mnt.h ${INSTALLROOT}/include/ast/mnt.h
+		exec - then ${STDCP} include/mnt.h ${INSTALLROOT}/include/ast/mnt.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/mnt.h generated
 	make ${INSTALLROOT}/include/ast/modecanon.h
 		prev include/modecanon.h
-		exec - if cmp 2>/dev/null -s include/modecanon.h ${INSTALLROOT}/include/ast/modecanon.h
-		exec - then :
-		exec - else ${STDCP} include/modecanon.h ${INSTALLROOT}/include/ast/modecanon.h
+		exec - if ! cmp -s include/modecanon.h ${INSTALLROOT}/include/ast/modecanon.h
+		exec - then ${STDCP} include/modecanon.h ${INSTALLROOT}/include/ast/modecanon.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/modecanon.h generated
 	make ${INSTALLROOT}/include/ast/modex.h
 		prev include/modex.h
-		exec - if cmp 2>/dev/null -s include/modex.h ${INSTALLROOT}/include/ast/modex.h
-		exec - then :
-		exec - else ${STDCP} include/modex.h ${INSTALLROOT}/include/ast/modex.h
+		exec - if ! cmp -s include/modex.h ${INSTALLROOT}/include/ast/modex.h
+		exec - then ${STDCP} include/modex.h ${INSTALLROOT}/include/ast/modex.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/modex.h generated
 	make ${INSTALLROOT}/include/ast/namval.h
 		prev include/namval.h
-		exec - if cmp 2>/dev/null -s include/namval.h ${INSTALLROOT}/include/ast/namval.h
-		exec - then :
-		exec - else ${STDCP} include/namval.h ${INSTALLROOT}/include/ast/namval.h
+		exec - if ! cmp -s include/namval.h ${INSTALLROOT}/include/ast/namval.h
+		exec - then ${STDCP} include/namval.h ${INSTALLROOT}/include/ast/namval.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/namval.h generated
 	make ${INSTALLROOT}/include/ast/option.h
 		prev include/option.h
-		exec - if cmp 2>/dev/null -s include/option.h ${INSTALLROOT}/include/ast/option.h
-		exec - then :
-		exec - else ${STDCP} include/option.h ${INSTALLROOT}/include/ast/option.h
+		exec - if ! cmp -s include/option.h ${INSTALLROOT}/include/ast/option.h
+		exec - then ${STDCP} include/option.h ${INSTALLROOT}/include/ast/option.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/option.h generated
 	make ${INSTALLROOT}/include/ast/proc.h
 		prev include/proc.h
-		exec - if cmp 2>/dev/null -s include/proc.h ${INSTALLROOT}/include/ast/proc.h
-		exec - then :
-		exec - else ${STDCP} include/proc.h ${INSTALLROOT}/include/ast/proc.h
+		exec - if ! cmp -s include/proc.h ${INSTALLROOT}/include/ast/proc.h
+		exec - then ${STDCP} include/proc.h ${INSTALLROOT}/include/ast/proc.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/proc.h generated
 	make ${INSTALLROOT}/include/ast/re_comp.h
 		prev comp/re_comp.h
-		exec - if cmp 2>/dev/null -s comp/re_comp.h ${INSTALLROOT}/include/ast/re_comp.h
-		exec - then :
-		exec - else ${STDCP} comp/re_comp.h ${INSTALLROOT}/include/ast/re_comp.h
+		exec - if ! cmp -s comp/re_comp.h ${INSTALLROOT}/include/ast/re_comp.h
+		exec - then ${STDCP} comp/re_comp.h ${INSTALLROOT}/include/ast/re_comp.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/re_comp.h generated
 	make ${INSTALLROOT}/include/ast/recfmt.h
 		prev include/recfmt.h
-		exec - if cmp 2>/dev/null -s include/recfmt.h ${INSTALLROOT}/include/ast/recfmt.h
-		exec - then :
-		exec - else ${STDCP} include/recfmt.h ${INSTALLROOT}/include/ast/recfmt.h
+		exec - if ! cmp -s include/recfmt.h ${INSTALLROOT}/include/ast/recfmt.h
+		exec - then ${STDCP} include/recfmt.h ${INSTALLROOT}/include/ast/recfmt.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/recfmt.h generated
 	make ${INSTALLROOT}/include/ast/regex.h
 		prev include/regex.h
-		exec - if cmp 2>/dev/null -s include/regex.h ${INSTALLROOT}/include/ast/regex.h
-		exec - then :
-		exec - else ${STDCP} include/regex.h ${INSTALLROOT}/include/ast/regex.h
+		exec - if ! cmp -s include/regex.h ${INSTALLROOT}/include/ast/regex.h
+		exec - then ${STDCP} include/regex.h ${INSTALLROOT}/include/ast/regex.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/regex.h generated
 	make ${INSTALLROOT}/include/ast/regexp.h
 		prev comp/regexp.h
-		exec - if cmp 2>/dev/null -s comp/regexp.h ${INSTALLROOT}/include/ast/regexp.h
-		exec - then :
-		exec - else ${STDCP} comp/regexp.h ${INSTALLROOT}/include/ast/regexp.h
+		exec - if ! cmp -s comp/regexp.h ${INSTALLROOT}/include/ast/regexp.h
+		exec - then ${STDCP} comp/regexp.h ${INSTALLROOT}/include/ast/regexp.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/regexp.h generated
 	make ${INSTALLROOT}/include/ast/sfio.h
 		prev include/sfio.h
-		exec - if cmp 2>/dev/null -s include/sfio.h ${INSTALLROOT}/include/ast/sfio.h
-		exec - then :
-		exec - else ${STDCP} include/sfio.h ${INSTALLROOT}/include/ast/sfio.h
+		exec - if ! cmp -s include/sfio.h ${INSTALLROOT}/include/ast/sfio.h
+		exec - then ${STDCP} include/sfio.h ${INSTALLROOT}/include/ast/sfio.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/sfio.h generated
 	make ${INSTALLROOT}/include/ast/sfio_s.h
 		prev include/sfio_s.h
-		exec - if cmp 2>/dev/null -s include/sfio_s.h ${INSTALLROOT}/include/ast/sfio_s.h
-		exec - then :
-		exec - else ${STDCP} include/sfio_s.h ${INSTALLROOT}/include/ast/sfio_s.h
+		exec - if ! cmp -s include/sfio_s.h ${INSTALLROOT}/include/ast/sfio_s.h
+		exec - then ${STDCP} include/sfio_s.h ${INSTALLROOT}/include/ast/sfio_s.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/sfio_s.h generated
 	make ${INSTALLROOT}/include/ast/sfio_t.h
 		prev include/sfio_t.h
-		exec - if cmp 2>/dev/null -s include/sfio_t.h ${INSTALLROOT}/include/ast/sfio_t.h
-		exec - then :
-		exec - else ${STDCP} include/sfio_t.h ${INSTALLROOT}/include/ast/sfio_t.h
+		exec - if ! cmp -s include/sfio_t.h ${INSTALLROOT}/include/ast/sfio_t.h
+		exec - then ${STDCP} include/sfio_t.h ${INSTALLROOT}/include/ast/sfio_t.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/sfio_t.h generated
 	make ${INSTALLROOT}/include/ast/sfdisc.h
 		prev include/sfdisc.h
-		exec - if cmp 2>/dev/null -s include/sfdisc.h ${INSTALLROOT}/include/ast/sfdisc.h
-		exec - then :
-		exec - else ${STDCP} include/sfdisc.h ${INSTALLROOT}/include/ast/sfdisc.h
+		exec - if ! cmp -s include/sfdisc.h ${INSTALLROOT}/include/ast/sfdisc.h
+		exec - then ${STDCP} include/sfdisc.h ${INSTALLROOT}/include/ast/sfdisc.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/sfdisc.h generated
 	make ${INSTALLROOT}/include/ast/shcmd.h
 		prev include/shcmd.h
-		exec - if cmp 2>/dev/null -s include/shcmd.h ${INSTALLROOT}/include/ast/shcmd.h
-		exec - then :
-		exec - else ${STDCP} include/shcmd.h ${INSTALLROOT}/include/ast/shcmd.h
+		exec - if ! cmp -s include/shcmd.h ${INSTALLROOT}/include/ast/shcmd.h
+		exec - then ${STDCP} include/shcmd.h ${INSTALLROOT}/include/ast/shcmd.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/shcmd.h generated
 	make ${INSTALLROOT}/include/ast/stack.h
 		prev include/stack.h
-		exec - if cmp 2>/dev/null -s include/stack.h ${INSTALLROOT}/include/ast/stack.h
-		exec - then :
-		exec - else ${STDCP} include/stack.h ${INSTALLROOT}/include/ast/stack.h
+		exec - if ! cmp -s include/stack.h ${INSTALLROOT}/include/ast/stack.h
+		exec - then ${STDCP} include/stack.h ${INSTALLROOT}/include/ast/stack.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/stack.h generated
 	make ${INSTALLROOT}/include/ast/stak.h
 		prev include/stak.h
-		exec - if cmp 2>/dev/null -s include/stak.h ${INSTALLROOT}/include/ast/stak.h
-		exec - then :
-		exec - else ${STDCP} include/stak.h ${INSTALLROOT}/include/ast/stak.h
+		exec - if ! cmp -s include/stak.h ${INSTALLROOT}/include/ast/stak.h
+		exec - then ${STDCP} include/stak.h ${INSTALLROOT}/include/ast/stak.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/stak.h generated
 	make ${INSTALLROOT}/include/ast/stk.h
 		prev include/stk.h
-		exec - if cmp 2>/dev/null -s include/stk.h ${INSTALLROOT}/include/ast/stk.h
-		exec - then :
-		exec - else ${STDCP} include/stk.h ${INSTALLROOT}/include/ast/stk.h
+		exec - if ! cmp -s include/stk.h ${INSTALLROOT}/include/ast/stk.h
+		exec - then ${STDCP} include/stk.h ${INSTALLROOT}/include/ast/stk.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/stk.h generated
 	make ${INSTALLROOT}/include/ast/swap.h
 		prev include/swap.h
-		exec - if cmp 2>/dev/null -s include/swap.h ${INSTALLROOT}/include/ast/swap.h
-		exec - then :
-		exec - else ${STDCP} include/swap.h ${INSTALLROOT}/include/ast/swap.h
+		exec - if ! cmp -s include/swap.h ${INSTALLROOT}/include/ast/swap.h
+		exec - then ${STDCP} include/swap.h ${INSTALLROOT}/include/ast/swap.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/swap.h generated
 	make ${INSTALLROOT}/include/ast/tar.h
 		make include/tar.h
 		done include/tar.h
-		exec - if cmp 2>/dev/null -s include/tar.h ${INSTALLROOT}/include/ast/tar.h
-		exec - then :
-		exec - else ${STDCP} include/tar.h ${INSTALLROOT}/include/ast/tar.h
+		exec - if ! cmp -s include/tar.h ${INSTALLROOT}/include/ast/tar.h
+		exec - then ${STDCP} include/tar.h ${INSTALLROOT}/include/ast/tar.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/tar.h generated
 	make ${INSTALLROOT}/include/ast/times.h
 		prev include/times.h
-		exec - if cmp 2>/dev/null -s include/times.h ${INSTALLROOT}/include/ast/times.h
-		exec - then :
-		exec - else ${STDCP} include/times.h ${INSTALLROOT}/include/ast/times.h
+		exec - if ! cmp -s include/times.h ${INSTALLROOT}/include/ast/times.h
+		exec - then ${STDCP} include/times.h ${INSTALLROOT}/include/ast/times.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/times.h generated
 	make ${INSTALLROOT}/include/ast/tm.h
 		prev include/tm.h
-		exec - if cmp 2>/dev/null -s include/tm.h ${INSTALLROOT}/include/ast/tm.h
-		exec - then :
-		exec - else ${STDCP} include/tm.h ${INSTALLROOT}/include/ast/tm.h
+		exec - if ! cmp -s include/tm.h ${INSTALLROOT}/include/ast/tm.h
+		exec - then ${STDCP} include/tm.h ${INSTALLROOT}/include/ast/tm.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/tm.h generated
 	make ${INSTALLROOT}/include/ast/tok.h
 		prev include/tok.h
-		exec - if cmp 2>/dev/null -s include/tok.h ${INSTALLROOT}/include/ast/tok.h
-		exec - then :
-		exec - else ${STDCP} include/tok.h ${INSTALLROOT}/include/ast/tok.h
+		exec - if ! cmp -s include/tok.h ${INSTALLROOT}/include/ast/tok.h
+		exec - then ${STDCP} include/tok.h ${INSTALLROOT}/include/ast/tok.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/tok.h generated
 	make ${INSTALLROOT}/include/ast/usage.h
 		make include/usage.h
 		done include/usage.h
-		exec - if cmp 2>/dev/null -s include/usage.h ${INSTALLROOT}/include/ast/usage.h
-		exec - then :
-		exec - else ${STDCP} include/usage.h ${INSTALLROOT}/include/ast/usage.h
+		exec - if ! cmp -s include/usage.h ${INSTALLROOT}/include/ast/usage.h
+		exec - then ${STDCP} include/usage.h ${INSTALLROOT}/include/ast/usage.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/usage.h generated
 	make ${INSTALLROOT}/include/ast/vdb.h
 		make include/vdb.h
 		done include/vdb.h
-		exec - if cmp 2>/dev/null -s include/vdb.h ${INSTALLROOT}/include/ast/vdb.h
-		exec - then :
-		exec - else ${STDCP} include/vdb.h ${INSTALLROOT}/include/ast/vdb.h
+		exec - if ! cmp -s include/vdb.h ${INSTALLROOT}/include/ast/vdb.h
+		exec - then ${STDCP} include/vdb.h ${INSTALLROOT}/include/ast/vdb.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/vdb.h generated
 	make ${INSTALLROOT}/include/ast/vecargs.h
 		prev include/vecargs.h
-		exec - if cmp 2>/dev/null -s include/vecargs.h ${INSTALLROOT}/include/ast/vecargs.h
-		exec - then :
-		exec - else ${STDCP} include/vecargs.h ${INSTALLROOT}/include/ast/vecargs.h
+		exec - if ! cmp -s include/vecargs.h ${INSTALLROOT}/include/ast/vecargs.h
+		exec - then ${STDCP} include/vecargs.h ${INSTALLROOT}/include/ast/vecargs.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/vecargs.h generated
 	make ${INSTALLROOT}/include/ast/vmalloc.h
 		prev include/vmalloc.h
-		exec - if cmp 2>/dev/null -s include/vmalloc.h ${INSTALLROOT}/include/ast/vmalloc.h
-		exec - then :
-		exec - else ${STDCP} include/vmalloc.h ${INSTALLROOT}/include/ast/vmalloc.h
+		exec - if ! cmp -s include/vmalloc.h ${INSTALLROOT}/include/ast/vmalloc.h
+		exec - then ${STDCP} include/vmalloc.h ${INSTALLROOT}/include/ast/vmalloc.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/vmalloc.h generated
 	make ${INSTALLROOT}/include/ast/wait.h
 		prev include/wait.h
-		exec - if cmp 2>/dev/null -s include/wait.h ${INSTALLROOT}/include/ast/wait.h
-		exec - then :
-		exec - else ${STDCP} include/wait.h ${INSTALLROOT}/include/ast/wait.h
+		exec - if ! cmp -s include/wait.h ${INSTALLROOT}/include/ast/wait.h
+		exec - then ${STDCP} include/wait.h ${INSTALLROOT}/include/ast/wait.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/wait.h generated
 	make ${INSTALLROOT}/include/ast/wordexp.h
 		prev comp/wordexp.h
-		exec - if cmp 2>/dev/null -s comp/wordexp.h ${INSTALLROOT}/include/ast/wordexp.h
-		exec - then :
-		exec - else ${STDCP} comp/wordexp.h ${INSTALLROOT}/include/ast/wordexp.h
+		exec - if ! cmp -s comp/wordexp.h ${INSTALLROOT}/include/ast/wordexp.h
+		exec - then ${STDCP} comp/wordexp.h ${INSTALLROOT}/include/ast/wordexp.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/wordexp.h generated
 	make ${INSTALLROOT}/include/ast/bytesex.h
 		prev std/bytesex.h
-		exec - if cmp 2>/dev/null -s std/bytesex.h ${INSTALLROOT}/include/ast/bytesex.h
-		exec - then :
-		exec - else ${STDCP} std/bytesex.h ${INSTALLROOT}/include/ast/bytesex.h
+		exec - if ! cmp -s std/bytesex.h ${INSTALLROOT}/include/ast/bytesex.h
+		exec - then ${STDCP} std/bytesex.h ${INSTALLROOT}/include/ast/bytesex.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/bytesex.h generated
 	make ${INSTALLROOT}/include/ast/endian.h
 		prev std/endian.h
-		exec - if cmp 2>/dev/null -s std/endian.h ${INSTALLROOT}/include/ast/endian.h
-		exec - then :
-		exec - else ${STDCP} std/endian.h ${INSTALLROOT}/include/ast/endian.h
+		exec - if ! cmp -s std/endian.h ${INSTALLROOT}/include/ast/endian.h
+		exec - then ${STDCP} std/endian.h ${INSTALLROOT}/include/ast/endian.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/endian.h generated
 	make ${INSTALLROOT}/include/ast/fnmatch.h
 		prev comp/fnmatch.h
-		exec - if cmp 2>/dev/null -s comp/fnmatch.h ${INSTALLROOT}/include/ast/fnmatch.h
-		exec - then :
-		exec - else ${STDCP} comp/fnmatch.h ${INSTALLROOT}/include/ast/fnmatch.h
+		exec - if ! cmp -s comp/fnmatch.h ${INSTALLROOT}/include/ast/fnmatch.h
+		exec - then ${STDCP} comp/fnmatch.h ${INSTALLROOT}/include/ast/fnmatch.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/fnmatch.h generated
 	make ${INSTALLROOT}/include/ast/magicid.h
 		make include/magicid.h
 			prev ast_common.h implicit
 		done include/magicid.h
-		exec - if cmp 2>/dev/null -s include/magicid.h ${INSTALLROOT}/include/ast/magicid.h
-		exec - then :
-		exec - else ${STDCP} include/magicid.h ${INSTALLROOT}/include/ast/magicid.h
+		exec - if ! cmp -s include/magicid.h ${INSTALLROOT}/include/ast/magicid.h
+		exec - then ${STDCP} include/magicid.h ${INSTALLROOT}/include/ast/magicid.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/magicid.h generated
 	make ${INSTALLROOT}/include/ast/fnv.h
 		prev include/fnv.h
-		exec - if cmp 2>/dev/null -s include/fnv.h ${INSTALLROOT}/include/ast/fnv.h
-		exec - then :
-		exec - else ${STDCP} include/fnv.h ${INSTALLROOT}/include/ast/fnv.h
+		exec - if ! cmp -s include/fnv.h ${INSTALLROOT}/include/ast/fnv.h
+		exec - then ${STDCP} include/fnv.h ${INSTALLROOT}/include/ast/fnv.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/fnv.h generated
 	make ${INSTALLROOT}/include/ast/aso.h
 		prev include/aso.h
-		exec - if cmp 2>/dev/null -s include/aso.h ${INSTALLROOT}/include/ast/aso.h
-		exec - then :
-		exec - else ${STDCP} include/aso.h ${INSTALLROOT}/include/ast/aso.h
+		exec - if ! cmp -s include/aso.h ${INSTALLROOT}/include/ast/aso.h
+		exec - then ${STDCP} include/aso.h ${INSTALLROOT}/include/ast/aso.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/aso.h generated
 	make ${INSTALLROOT}/include/ast/dirent.h
 		prev std/dirent.h
-		exec - if cmp 2>/dev/null -s std/dirent.h ${INSTALLROOT}/include/ast/dirent.h
-		exec - then :
-		exec - else ${STDCP} std/dirent.h ${INSTALLROOT}/include/ast/dirent.h
+		exec - if ! cmp -s std/dirent.h ${INSTALLROOT}/include/ast/dirent.h
+		exec - then ${STDCP} std/dirent.h ${INSTALLROOT}/include/ast/dirent.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/dirent.h generated
 	make ${INSTALLROOT}/include/ast/iconv.h
 		prev std/iconv.h
-		exec - if cmp 2>/dev/null -s std/iconv.h ${INSTALLROOT}/include/ast/iconv.h
-		exec - then :
-		exec - else ${STDCP} std/iconv.h ${INSTALLROOT}/include/ast/iconv.h
+		exec - if ! cmp -s std/iconv.h ${INSTALLROOT}/include/ast/iconv.h
+		exec - then ${STDCP} std/iconv.h ${INSTALLROOT}/include/ast/iconv.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/iconv.h generated
 	make ${INSTALLROOT}/include/ast/nl_types.h
 		prev std/nl_types.h
-		exec - if cmp 2>/dev/null -s std/nl_types.h ${INSTALLROOT}/include/ast/nl_types.h
-		exec - then :
-		exec - else ${STDCP} std/nl_types.h ${INSTALLROOT}/include/ast/nl_types.h
+		exec - if ! cmp -s std/nl_types.h ${INSTALLROOT}/include/ast/nl_types.h
+		exec - then ${STDCP} std/nl_types.h ${INSTALLROOT}/include/ast/nl_types.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/nl_types.h generated
 	make ${INSTALLROOT}/include/ast/stdio.h
 		prev std/stdio.h
-		exec - if cmp 2>/dev/null -s std/stdio.h ${INSTALLROOT}/include/ast/stdio.h
-		exec - then :
-		exec - else ${STDCP} std/stdio.h ${INSTALLROOT}/include/ast/stdio.h
+		exec - if ! cmp -s std/stdio.h ${INSTALLROOT}/include/ast/stdio.h
+		exec - then ${STDCP} std/stdio.h ${INSTALLROOT}/include/ast/stdio.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/stdio.h generated
 	make ${INSTALLROOT}/include/ast/wchar.h
 		prev std/wchar.h
-		exec - if cmp 2>/dev/null -s std/wchar.h ${INSTALLROOT}/include/ast/wchar.h
-		exec - then :
-		exec - else ${STDCP} std/wchar.h ${INSTALLROOT}/include/ast/wchar.h
+		exec - if ! cmp -s std/wchar.h ${INSTALLROOT}/include/ast/wchar.h
+		exec - then ${STDCP} std/wchar.h ${INSTALLROOT}/include/ast/wchar.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/wchar.h generated
 	make ${INSTALLROOT}/include/ast/wctype.h
 		prev std/wctype.h
-		exec - if cmp 2>/dev/null -s std/wctype.h ${INSTALLROOT}/include/ast/wctype.h
-		exec - then :
-		exec - else ${STDCP} std/wctype.h ${INSTALLROOT}/include/ast/wctype.h
+		exec - if ! cmp -s std/wctype.h ${INSTALLROOT}/include/ast/wctype.h
+		exec - then ${STDCP} std/wctype.h ${INSTALLROOT}/include/ast/wctype.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/wctype.h generated
 	make ${INSTALLROOT}/include/ast/align.h
 		prev align.h
-		exec - if cmp 2>/dev/null -s align.h ${INSTALLROOT}/include/ast/align.h
-		exec - then :
-		exec - else ${STDCP} align.h ${INSTALLROOT}/include/ast/align.h
+		exec - if ! cmp -s align.h ${INSTALLROOT}/include/ast/align.h
+		exec - then ${STDCP} align.h ${INSTALLROOT}/include/ast/align.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/align.h generated
 	make ${INSTALLROOT}/include/ast/preroot.h
 		prev preroot.h
-		exec - if cmp 2>/dev/null -s preroot.h ${INSTALLROOT}/include/ast/preroot.h
-		exec - then :
-		exec - else ${STDCP} preroot.h ${INSTALLROOT}/include/ast/preroot.h
+		exec - if ! cmp -s preroot.h ${INSTALLROOT}/include/ast/preroot.h
+		exec - then ${STDCP} preroot.h ${INSTALLROOT}/include/ast/preroot.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/preroot.h generated
 	make ${INSTALLROOT}/include/ast/sig.h
 		prev sig.h
-		exec - if cmp 2>/dev/null -s sig.h ${INSTALLROOT}/include/ast/sig.h
-		exec - then :
-		exec - else ${STDCP} sig.h ${INSTALLROOT}/include/ast/sig.h
+		exec - if ! cmp -s sig.h ${INSTALLROOT}/include/ast/sig.h
+		exec - then ${STDCP} sig.h ${INSTALLROOT}/include/ast/sig.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/sig.h generated
 	make ${INSTALLROOT}/include/ast/tmx.h
 		prev tmx.h
-		exec - if cmp 2>/dev/null -s tmx.h ${INSTALLROOT}/include/ast/tmx.h
-		exec - then :
-		exec - else ${STDCP} tmx.h ${INSTALLROOT}/include/ast/tmx.h
+		exec - if ! cmp -s tmx.h ${INSTALLROOT}/include/ast/tmx.h
+		exec - then ${STDCP} tmx.h ${INSTALLROOT}/include/ast/tmx.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/tmx.h generated
 	make ${INSTALLROOT}/include/ast/tv.h
 		prev tv.h
-		exec - if cmp 2>/dev/null -s tv.h ${INSTALLROOT}/include/ast/tv.h
-		exec - then :
-		exec - else ${STDCP} tv.h ${INSTALLROOT}/include/ast/tv.h
+		exec - if ! cmp -s tv.h ${INSTALLROOT}/include/ast/tv.h
+		exec - then ${STDCP} tv.h ${INSTALLROOT}/include/ast/tv.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/tv.h generated
 	make ${INSTALLROOT}/include/ast/ast_api.h
 		prev ast_api.h
-		exec - if cmp 2>/dev/null -s ast_api.h ${INSTALLROOT}/include/ast/ast_api.h
-		exec - then :
-		exec - else ${STDCP} ast_api.h ${INSTALLROOT}/include/ast/ast_api.h
+		exec - if ! cmp -s ast_api.h ${INSTALLROOT}/include/ast/ast_api.h
+		exec - then ${STDCP} ast_api.h ${INSTALLROOT}/include/ast/ast_api.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_api.h generated
 	make ${INSTALLROOT}/include/ast/ast_botch.h
 		prev ast_botch.h
-		exec - if cmp 2>/dev/null -s ast_botch.h ${INSTALLROOT}/include/ast/ast_botch.h
-		exec - then :
-		exec - else ${STDCP} ast_botch.h ${INSTALLROOT}/include/ast/ast_botch.h
+		exec - if ! cmp -s ast_botch.h ${INSTALLROOT}/include/ast/ast_botch.h
+		exec - then ${STDCP} ast_botch.h ${INSTALLROOT}/include/ast/ast_botch.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_botch.h generated
 	make ${INSTALLROOT}/include/ast/ast_ccode.h
 		prev ast_ccode.h
-		exec - if cmp 2>/dev/null -s ast_ccode.h ${INSTALLROOT}/include/ast/ast_ccode.h
-		exec - then :
-		exec - else ${STDCP} ast_ccode.h ${INSTALLROOT}/include/ast/ast_ccode.h
+		exec - if ! cmp -s ast_ccode.h ${INSTALLROOT}/include/ast/ast_ccode.h
+		exec - then ${STDCP} ast_ccode.h ${INSTALLROOT}/include/ast/ast_ccode.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_ccode.h generated
 	make ${INSTALLROOT}/include/ast/ast_fcntl.h
 		prev ast_fcntl.h
-		exec - if cmp 2>/dev/null -s ast_fcntl.h ${INSTALLROOT}/include/ast/ast_fcntl.h
-		exec - then :
-		exec - else ${STDCP} ast_fcntl.h ${INSTALLROOT}/include/ast/ast_fcntl.h
+		exec - if ! cmp -s ast_fcntl.h ${INSTALLROOT}/include/ast/ast_fcntl.h
+		exec - then ${STDCP} ast_fcntl.h ${INSTALLROOT}/include/ast/ast_fcntl.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_fcntl.h generated
 	make ${INSTALLROOT}/include/ast/ast_float.h
 		make ast_float.h
 			prev FEATURE/float
-			exec - cmp 2>/dev/null -s FEATURE/float ast_float.h || { rm -f ast_float.h; silent test -d . || mkdir .; ${STDCP} FEATURE/float ast_float.h; }
+			exec - cmp -s FEATURE/float ast_float.h || { rm -f ast_float.h; silent test -d . || mkdir .; ${STDCP} FEATURE/float ast_float.h; }
 			prev ast_common.h implicit
 		done ast_float.h generated
-		exec - if cmp 2>/dev/null -s ast_float.h ${INSTALLROOT}/include/ast/ast_float.h
-		exec - then :
-		exec - else ${STDCP} ast_float.h ${INSTALLROOT}/include/ast/ast_float.h
+		exec - if ! cmp -s ast_float.h ${INSTALLROOT}/include/ast/ast_float.h
+		exec - then ${STDCP} ast_float.h ${INSTALLROOT}/include/ast/ast_float.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_float.h generated
 	make ${INSTALLROOT}/include/ast/ast_fs.h
 		prev ast_fs.h
-		exec - if cmp 2>/dev/null -s ast_fs.h ${INSTALLROOT}/include/ast/ast_fs.h
-		exec - then :
-		exec - else ${STDCP} ast_fs.h ${INSTALLROOT}/include/ast/ast_fs.h
+		exec - if ! cmp -s ast_fs.h ${INSTALLROOT}/include/ast/ast_fs.h
+		exec - then ${STDCP} ast_fs.h ${INSTALLROOT}/include/ast/ast_fs.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_fs.h generated
 	make ${INSTALLROOT}/include/ast/ast_lib.h
 		prev ast_lib.h
-		exec - if cmp 2>/dev/null -s ast_lib.h ${INSTALLROOT}/include/ast/ast_lib.h
-		exec - then :
-		exec - else ${STDCP} ast_lib.h ${INSTALLROOT}/include/ast/ast_lib.h
+		exec - if ! cmp -s ast_lib.h ${INSTALLROOT}/include/ast/ast_lib.h
+		exec - then ${STDCP} ast_lib.h ${INSTALLROOT}/include/ast/ast_lib.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_lib.h generated
 	make ${INSTALLROOT}/include/ast/ast_map.h
 		prev ast_map.h
-		exec - if cmp 2>/dev/null -s ast_map.h ${INSTALLROOT}/include/ast/ast_map.h
-		exec - then :
-		exec - else ${STDCP} ast_map.h ${INSTALLROOT}/include/ast/ast_map.h
+		exec - if ! cmp -s ast_map.h ${INSTALLROOT}/include/ast/ast_map.h
+		exec - then ${STDCP} ast_map.h ${INSTALLROOT}/include/ast/ast_map.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_map.h generated
 	make ${INSTALLROOT}/include/ast/ast_mmap.h
 		prev ast_mmap.h
-		exec - if cmp 2>/dev/null -s ast_mmap.h ${INSTALLROOT}/include/ast/ast_mmap.h
-		exec - then :
-		exec - else ${STDCP} ast_mmap.h ${INSTALLROOT}/include/ast/ast_mmap.h
+		exec - if ! cmp -s ast_mmap.h ${INSTALLROOT}/include/ast/ast_mmap.h
+		exec - then ${STDCP} ast_mmap.h ${INSTALLROOT}/include/ast/ast_mmap.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_mmap.h generated
 	make ${INSTALLROOT}/include/ast/ast_mode.h
 		prev ast_mode.h
-		exec - if cmp 2>/dev/null -s ast_mode.h ${INSTALLROOT}/include/ast/ast_mode.h
-		exec - then :
-		exec - else ${STDCP} ast_mode.h ${INSTALLROOT}/include/ast/ast_mode.h
+		exec - if ! cmp -s ast_mode.h ${INSTALLROOT}/include/ast/ast_mode.h
+		exec - then ${STDCP} ast_mode.h ${INSTALLROOT}/include/ast/ast_mode.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_mode.h generated
 	make ${INSTALLROOT}/include/ast/ast_ndbm.h
@@ -6993,67 +6908,58 @@ make install
 				exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/ndbm
 				prev std/stdio.h implicit
 			done FEATURE/ndbm generated
-			exec - cmp 2>/dev/null -s FEATURE/ndbm ast_ndbm.h || { rm -f ast_ndbm.h; silent test -d . || mkdir .; ${STDCP} FEATURE/ndbm ast_ndbm.h; }
+			exec - cmp -s FEATURE/ndbm ast_ndbm.h || { rm -f ast_ndbm.h; silent test -d . || mkdir .; ${STDCP} FEATURE/ndbm ast_ndbm.h; }
 		done ast_ndbm.h generated
-		exec - if cmp 2>/dev/null -s ast_ndbm.h ${INSTALLROOT}/include/ast/ast_ndbm.h
-		exec - then :
-		exec - else ${STDCP} ast_ndbm.h ${INSTALLROOT}/include/ast/ast_ndbm.h
+		exec - if ! cmp -s ast_ndbm.h ${INSTALLROOT}/include/ast/ast_ndbm.h
+		exec - then ${STDCP} ast_ndbm.h ${INSTALLROOT}/include/ast/ast_ndbm.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_ndbm.h generated
 	make ${INSTALLROOT}/include/ast/ast_param.h
 		prev ast_param.h
-		exec - if cmp 2>/dev/null -s ast_param.h ${INSTALLROOT}/include/ast/ast_param.h
-		exec - then :
-		exec - else ${STDCP} ast_param.h ${INSTALLROOT}/include/ast/ast_param.h
+		exec - if ! cmp -s ast_param.h ${INSTALLROOT}/include/ast/ast_param.h
+		exec - then ${STDCP} ast_param.h ${INSTALLROOT}/include/ast/ast_param.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_param.h generated
 	make ${INSTALLROOT}/include/ast/ast_sys.h
 		prev ast_sys.h
-		exec - if cmp 2>/dev/null -s ast_sys.h ${INSTALLROOT}/include/ast/ast_sys.h
-		exec - then :
-		exec - else ${STDCP} ast_sys.h ${INSTALLROOT}/include/ast/ast_sys.h
+		exec - if ! cmp -s ast_sys.h ${INSTALLROOT}/include/ast/ast_sys.h
+		exec - then ${STDCP} ast_sys.h ${INSTALLROOT}/include/ast/ast_sys.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_sys.h generated
 	make ${INSTALLROOT}/include/ast/ast_time.h
 		prev ast_time.h
-		exec - if cmp 2>/dev/null -s ast_time.h ${INSTALLROOT}/include/ast/ast_time.h
-		exec - then :
-		exec - else ${STDCP} ast_time.h ${INSTALLROOT}/include/ast/ast_time.h
+		exec - if ! cmp -s ast_time.h ${INSTALLROOT}/include/ast/ast_time.h
+		exec - then ${STDCP} ast_time.h ${INSTALLROOT}/include/ast/ast_time.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_time.h generated
 	make ${INSTALLROOT}/include/ast/ast_tty.h
 		prev ast_tty.h
-		exec - if cmp 2>/dev/null -s ast_tty.h ${INSTALLROOT}/include/ast/ast_tty.h
-		exec - then :
-		exec - else ${STDCP} ast_tty.h ${INSTALLROOT}/include/ast/ast_tty.h
+		exec - if ! cmp -s ast_tty.h ${INSTALLROOT}/include/ast/ast_tty.h
+		exec - then ${STDCP} ast_tty.h ${INSTALLROOT}/include/ast/ast_tty.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_tty.h generated
 	make ${INSTALLROOT}/include/ast/ast_vfork.h
 		prev ast_vfork.h
-		exec - if cmp 2>/dev/null -s ast_vfork.h ${INSTALLROOT}/include/ast/ast_vfork.h
-		exec - then :
-		exec - else ${STDCP} ast_vfork.h ${INSTALLROOT}/include/ast/ast_vfork.h
+		exec - if ! cmp -s ast_vfork.h ${INSTALLROOT}/include/ast/ast_vfork.h
+		exec - then ${STDCP} ast_vfork.h ${INSTALLROOT}/include/ast/ast_vfork.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_vfork.h generated
 	make ${INSTALLROOT}/include/ast/ast_wait.h
 		prev ast_wait.h
-		exec - if cmp 2>/dev/null -s ast_wait.h ${INSTALLROOT}/include/ast/ast_wait.h
-		exec - then :
-		exec - else ${STDCP} ast_wait.h ${INSTALLROOT}/include/ast/ast_wait.h
+		exec - if ! cmp -s ast_wait.h ${INSTALLROOT}/include/ast/ast_wait.h
+		exec - then ${STDCP} ast_wait.h ${INSTALLROOT}/include/ast/ast_wait.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_wait.h generated
 	make ${INSTALLROOT}/include/ast/ast_limits.h
 		prev ast_limits.h
-		exec - if cmp 2>/dev/null -s ast_limits.h ${INSTALLROOT}/include/ast/ast_limits.h
-		exec - then :
-		exec - else ${STDCP} ast_limits.h ${INSTALLROOT}/include/ast/ast_limits.h
+		exec - if ! cmp -s ast_limits.h ${INSTALLROOT}/include/ast/ast_limits.h
+		exec - then ${STDCP} ast_limits.h ${INSTALLROOT}/include/ast/ast_limits.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_limits.h generated
 	make ${INSTALLROOT}/include/ast/ast_standards.h
 		prev ast_standards.h
-		exec - if cmp 2>/dev/null -s ast_standards.h ${INSTALLROOT}/include/ast/ast_standards.h
-		exec - then :
-		exec - else ${STDCP} ast_standards.h ${INSTALLROOT}/include/ast/ast_standards.h
+		exec - if ! cmp -s ast_standards.h ${INSTALLROOT}/include/ast/ast_standards.h
+		exec - then ${STDCP} ast_standards.h ${INSTALLROOT}/include/ast/ast_standards.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_standards.h generated
 	make ${INSTALLROOT}/include/ast/ast_sizeof.h
@@ -7064,53 +6970,46 @@ make install
 				done features/sizeof
 				exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" run features/sizeof
 			done FEATURE/sizeof generated
-			exec - cmp 2>/dev/null -s FEATURE/sizeof ast_sizeof.h || { rm -f ast_sizeof.h; silent test -d . || mkdir .; ${STDCP} FEATURE/sizeof ast_sizeof.h; }
+			exec - cmp -s FEATURE/sizeof ast_sizeof.h || { rm -f ast_sizeof.h; silent test -d . || mkdir .; ${STDCP} FEATURE/sizeof ast_sizeof.h; }
 		done ast_sizeof.h generated
-		exec - if cmp 2>/dev/null -s ast_sizeof.h ${INSTALLROOT}/include/ast/ast_sizeof.h
-		exec - then :
-		exec - else ${STDCP} ast_sizeof.h ${INSTALLROOT}/include/ast/ast_sizeof.h
+		exec - if ! cmp -s ast_sizeof.h ${INSTALLROOT}/include/ast/ast_sizeof.h
+		exec - then ${STDCP} ast_sizeof.h ${INSTALLROOT}/include/ast/ast_sizeof.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_sizeof.h generated
 	make ${INSTALLROOT}/include/ast/ast_dirent.h
 		prev ast_dirent.h
-		exec - if cmp 2>/dev/null -s ast_dirent.h ${INSTALLROOT}/include/ast/ast_dirent.h
-		exec - then :
-		exec - else ${STDCP} ast_dirent.h ${INSTALLROOT}/include/ast/ast_dirent.h
+		exec - if ! cmp -s ast_dirent.h ${INSTALLROOT}/include/ast/ast_dirent.h
+		exec - then ${STDCP} ast_dirent.h ${INSTALLROOT}/include/ast/ast_dirent.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_dirent.h generated
 	make ${INSTALLROOT}/include/ast/ast_iconv.h
 		prev ast_iconv.h
-		exec - if cmp 2>/dev/null -s ast_iconv.h ${INSTALLROOT}/include/ast/ast_iconv.h
-		exec - then :
-		exec - else ${STDCP} ast_iconv.h ${INSTALLROOT}/include/ast/ast_iconv.h
+		exec - if ! cmp -s ast_iconv.h ${INSTALLROOT}/include/ast/ast_iconv.h
+		exec - then ${STDCP} ast_iconv.h ${INSTALLROOT}/include/ast/ast_iconv.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_iconv.h generated
 	make ${INSTALLROOT}/include/ast/ast_nl_types.h
 		prev ast_nl_types.h
-		exec - if cmp 2>/dev/null -s ast_nl_types.h ${INSTALLROOT}/include/ast/ast_nl_types.h
-		exec - then :
-		exec - else ${STDCP} ast_nl_types.h ${INSTALLROOT}/include/ast/ast_nl_types.h
+		exec - if ! cmp -s ast_nl_types.h ${INSTALLROOT}/include/ast/ast_nl_types.h
+		exec - then ${STDCP} ast_nl_types.h ${INSTALLROOT}/include/ast/ast_nl_types.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_nl_types.h generated
 	make ${INSTALLROOT}/include/ast/ast_stdio.h
 		prev ast_stdio.h
-		exec - if cmp 2>/dev/null -s ast_stdio.h ${INSTALLROOT}/include/ast/ast_stdio.h
-		exec - then :
-		exec - else ${STDCP} ast_stdio.h ${INSTALLROOT}/include/ast/ast_stdio.h
+		exec - if ! cmp -s ast_stdio.h ${INSTALLROOT}/include/ast/ast_stdio.h
+		exec - then ${STDCP} ast_stdio.h ${INSTALLROOT}/include/ast/ast_stdio.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_stdio.h generated
 	make ${INSTALLROOT}/include/ast/ast_wchar.h
 		prev ast_wchar.h
-		exec - if cmp 2>/dev/null -s ast_wchar.h ${INSTALLROOT}/include/ast/ast_wchar.h
-		exec - then :
-		exec - else ${STDCP} ast_wchar.h ${INSTALLROOT}/include/ast/ast_wchar.h
+		exec - if ! cmp -s ast_wchar.h ${INSTALLROOT}/include/ast/ast_wchar.h
+		exec - then ${STDCP} ast_wchar.h ${INSTALLROOT}/include/ast/ast_wchar.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_wchar.h generated
 	make ${INSTALLROOT}/include/ast/ast_wctype.h
 		prev ast_wctype.h
-		exec - if cmp 2>/dev/null -s ast_wctype.h ${INSTALLROOT}/include/ast/ast_wctype.h
-		exec - then :
-		exec - else ${STDCP} ast_wctype.h ${INSTALLROOT}/include/ast/ast_wctype.h
+		exec - if ! cmp -s ast_wctype.h ${INSTALLROOT}/include/ast/ast_wctype.h
+		exec - then ${STDCP} ast_wctype.h ${INSTALLROOT}/include/ast/ast_wctype.h
 		exec - fi
 	done ${INSTALLROOT}/include/ast/ast_wctype.h generated
 	make ${INSTALLROOT}/lib/file
@@ -7128,15 +7027,13 @@ make install
 	prev ast_lib.h
 	exec - case ${mam_cc_HOSTTYPE} in
 	exec - win32.*)
-	exec - if cmp 2>/dev/null -s comp/fmtmsg.h ${INSTALLROOT}/include/ast/fmtmsg.h
-	exec - then :
-	exec - else ${STDCP} comp/fmtmsg.h ${INSTALLROOT}/include/ast/fmtmsg.h
+	exec - if ! cmp -s comp/fmtmsg.h ${INSTALLROOT}/include/ast/fmtmsg.h
+	exec - then ${STDCP} comp/fmtmsg.h ${INSTALLROOT}/include/ast/fmtmsg.h
 	exec - fi
 	exec - ;;
 	exec - *) silent grep -l 'define[ 	][ 	]*_[hl][di][rb]_fmtmsg' ast_lib.h > /dev/null || {
-	exec - if cmp 2>/dev/null -s comp/fmtmsg.h ${INSTALLROOT}/include/ast/fmtmsg.h
-	exec - then :
-	exec - else ${STDCP} comp/fmtmsg.h ${INSTALLROOT}/include/ast/fmtmsg.h
+	exec - if ! cmp -s comp/fmtmsg.h ${INSTALLROOT}/include/ast/fmtmsg.h
+	exec - then ${STDCP} comp/fmtmsg.h ${INSTALLROOT}/include/ast/fmtmsg.h
 	exec - fi
 	exec - }
 	exec - ;;
@@ -7145,15 +7042,13 @@ make install
 	prev ast_lib.h
 	exec - case ${mam_cc_HOSTTYPE} in
 	exec - win32.*)
-	exec - if cmp 2>/dev/null -s comp/libgen.h ${INSTALLROOT}/include/ast/libgen.h
-	exec - then :
-	exec - else ${STDCP} comp/libgen.h ${INSTALLROOT}/include/ast/libgen.h
+	exec - if ! cmp -s comp/libgen.h ${INSTALLROOT}/include/ast/libgen.h
+	exec - then ${STDCP} comp/libgen.h ${INSTALLROOT}/include/ast/libgen.h
 	exec - fi
 	exec - ;;
 	exec - *) silent grep -l 'define[ 	][ 	]*_[hl][di][rb]_libgen' ast_lib.h > /dev/null || {
-	exec - if cmp 2>/dev/null -s comp/libgen.h ${INSTALLROOT}/include/ast/libgen.h
-	exec - then :
-	exec - else ${STDCP} comp/libgen.h ${INSTALLROOT}/include/ast/libgen.h
+	exec - if ! cmp -s comp/libgen.h ${INSTALLROOT}/include/ast/libgen.h
+	exec - then ${STDCP} comp/libgen.h ${INSTALLROOT}/include/ast/libgen.h
 	exec - fi
 	exec - }
 	exec - ;;
@@ -7162,15 +7057,13 @@ make install
 	prev ast_lib.h
 	exec - case ${mam_cc_HOSTTYPE} in
 	exec - win32.*)
-	exec - if cmp 2>/dev/null -s comp/syslog.h ${INSTALLROOT}/include/ast/syslog.h
-	exec - then :
-	exec - else ${STDCP} comp/syslog.h ${INSTALLROOT}/include/ast/syslog.h
+	exec - if ! cmp -s comp/syslog.h ${INSTALLROOT}/include/ast/syslog.h
+	exec - then ${STDCP} comp/syslog.h ${INSTALLROOT}/include/ast/syslog.h
 	exec - fi
 	exec - ;;
 	exec - *) silent grep -l 'define[ 	][ 	]*_[hl][di][rb]_syslog' ast_lib.h > /dev/null || {
-	exec - if cmp 2>/dev/null -s comp/syslog.h ${INSTALLROOT}/include/ast/syslog.h
-	exec - then :
-	exec - else ${STDCP} comp/syslog.h ${INSTALLROOT}/include/ast/syslog.h
+	exec - if ! cmp -s comp/syslog.h ${INSTALLROOT}/include/ast/syslog.h
+	exec - then ${STDCP} comp/syslog.h ${INSTALLROOT}/include/ast/syslog.h
 	exec - fi
 	exec - }
 	exec - ;;
diff --git a/src/lib/libast/disc/sfdcfilter.c b/src/lib/libast/disc/sfdcfilter.c
index 83fa1fb9a..0500e938d 100644
--- a/src/lib/libast/disc/sfdcfilter.c
+++ b/src/lib/libast/disc/sfdcfilter.c
@@ -94,7 +94,7 @@ static ssize_t filterread(Sfio_t*	f,	/* stream reading from */
 }
 
 static ssize_t filterwrite(Sfio_t*	f,	/* stream writing to */
-			   void*	buf,	/* buffer to write into */
+			   const void*	buf,	/* buffer to write into */
 			   size_t	n,	/* number of bytes requested */
 			   Sfdisc_t*	disc)	/* discipline */
 {
diff --git a/src/lib/libast/disc/sfdcseekable.c b/src/lib/libast/disc/sfdcseekable.c
index 6aaca011d..f9d5135ef 100644
--- a/src/lib/libast/disc/sfdcseekable.c
+++ b/src/lib/libast/disc/sfdcseekable.c
@@ -39,7 +39,7 @@ typedef struct _skable_s
 } Seek_t;
 
 static ssize_t skwrite(Sfio_t*		f,	/* stream involved */
-		       void*		buf,	/* buffer to read into */
+		       const void*	buf,	/* buffer to read into */
 		       size_t		n,	/* number of bytes to read */
 		       Sfdisc_t*	disc)	/* discipline */
 {
diff --git a/src/lib/libcmd/Mamfile b/src/lib/libcmd/Mamfile
index 1fd261bea..ee2470830 100644
--- a/src/lib/libcmd/Mamfile
+++ b/src/lib/libcmd/Mamfile
@@ -429,7 +429,7 @@ make install
 							exec - ${PACKAGEROOT}/src/lib/libcmd/cmdinit.c ${PACKAGEROOT}/src/lib/libcmd/basename.c ${PACKAGEROOT}/src/lib/libcmd/cat.c ${PACKAGEROOT}/src/lib/libcmd/chgrp.c ${PACKAGEROOT}/src/lib/libcmd/chmod.c ${PACKAGEROOT}/src/lib/libcmd/chown.c ${PACKAGEROOT}/src/lib/libcmd/cksum.c ${PACKAGEROOT}/src/lib/libcmd/cmp.c ${PACKAGEROOT}/src/lib/libcmd/comm.c ${PACKAGEROOT}/src/lib/libcmd/cp.c ${PACKAGEROOT}/src/lib/libcmd/cut.c ${PACKAGEROOT}/src/lib/libcmd/dirname.c ${PACKAGEROOT}/src/lib/libcmd/date.c ${PACKAGEROOT}/src/lib/libcmd/expr.c ${PACKAGEROOT}/src/lib/libcmd/fds.c ${PACKAGEROOT}/src/lib/libcmd/fmt.c ${PACKAGEROOT}/src/lib/libcmd/fold.c ${PACKAGEROOT}/src/lib/libcmd/getconf.c ${PACKAGEROOT}/src/lib/libcmd/head.c ${PACKAGEROOT}/src/lib/libcmd/id.c ${PACKAGEROOT}/src/lib/libcmd/join.c ${PACKAGEROOT}/src/lib/libcmd/ln.c ${PACKAGEROOT}/src/lib/libcmd/logname.c ${PACKAGEROOT}/src/lib/libcmd/md5sum.c ${PACKAGEROOT}/src/lib/libcmd/mkdir.c ${PACKAGEROOT}/src/lib/libcmd/mkfifo.c ${PACKAGEROOT}/src/lib/libcmd/mktemp.c ${PACKAGEROOT}/src/lib/libcmd/mv.c ${PACKAGEROOT}/src/lib/libcmd/paste.c ${PACKAGEROOT}/src/lib/libcmd/pathchk.c ${PACKAGEROOT}/src/lib/libcmd/pids.c ${PACKAGEROOT}/src/lib/libcmd/rev.c ${PACKAGEROOT}/src/lib/libcmd/rm.c ${PACKAGEROOT}/src/lib/libcmd/rmdir.c ${PACKAGEROOT}/src/lib/libcmd/stty.c ${PACKAGEROOT}/src/lib/libcmd/sum.c ${PACKAGEROOT}/src/lib/libcmd/sync.c ${PACKAGEROOT}/src/lib/libcmd/tail.c ${PACKAGEROOT}/src/lib/libcmd/tee.c ${PACKAGEROOT}/src/lib/libcmd/tty.c ${PACKAGEROOT}/src/lib/libcmd/uname.c ${PACKAGEROOT}/src/lib/libcmd/uniq.c ${PACKAGEROOT}/src/lib/libcmd/vmstate.c ${PACKAGEROOT}/src/lib/libcmd/wc.c ${PACKAGEROOT}/src/lib/libcmd/revlib.c ${PACKAGEROOT}/src/lib/libcmd/wclib.c ${PACKAGEROOT}/src/lib/libcmd/lib.c |
 							exec - sort -u
 							exec - } > 1.${COTEMP}.h
-							exec - if cmp 2>/dev/null -s 1.${COTEMP}.h cmdext.h
+							exec - if cmp -s 1.${COTEMP}.h cmdext.h
 							exec - then rm -f 1.${COTEMP}.h
 							exec - else mv 1.${COTEMP}.h cmdext.h
 							exec - fi
@@ -762,16 +762,14 @@ make install
 	make ${PACKAGE_ast_INCLUDE}/cmd.h
 		prev ${PACKAGE_ast_INCLUDE}
 		prev cmd.h
-		exec - if cmp 2>/dev/null -s cmd.h ${PACKAGE_ast_INCLUDE}/cmd.h
-		exec - then :
-		exec - else ${STDCP} cmd.h ${PACKAGE_ast_INCLUDE}/cmd.h
+		exec - if ! cmp -s cmd.h ${PACKAGE_ast_INCLUDE}/cmd.h
+		exec - then ${STDCP} cmd.h ${PACKAGE_ast_INCLUDE}/cmd.h
 		exec - fi
 	done ${PACKAGE_ast_INCLUDE}/cmd.h generated
 	make ${PACKAGE_ast_INCLUDE}/cmdext.h
 		prev cmdext.h
-		exec - if cmp 2>/dev/null -s cmdext.h ${PACKAGE_ast_INCLUDE}/cmdext.h
-		exec - then :
-		exec - else ${STDCP} cmdext.h ${PACKAGE_ast_INCLUDE}/cmdext.h
+		exec - if ! cmp -s cmdext.h ${PACKAGE_ast_INCLUDE}/cmdext.h
+		exec - then ${STDCP} cmdext.h ${PACKAGE_ast_INCLUDE}/cmdext.h
 		exec - fi
 	done ${PACKAGE_ast_INCLUDE}/cmdext.h generated
 	make ${PACKAGE_ast_INCLUDE}/cmdlist.h
@@ -838,14 +836,13 @@ make install
 			exec - |
 			exec - sort -u
 			exec - } > 1.${COTEMP}.h
-			exec - if cmp 2>/dev/null -s 1.${COTEMP}.h cmdlist.h
+			exec - if cmp -s 1.${COTEMP}.h cmdlist.h
 			exec - then rm -f 1.${COTEMP}.h
 			exec - else mv 1.${COTEMP}.h cmdlist.h
 			exec - fi
 		done cmdlist.h generated
-		exec - if cmp 2>/dev/null -s cmdlist.h ${PACKAGE_ast_INCLUDE}/cmdlist.h
-		exec - then :
-		exec - else ${STDCP} cmdlist.h ${PACKAGE_ast_INCLUDE}/cmdlist.h
+		exec - if ! cmp -s cmdlist.h ${PACKAGE_ast_INCLUDE}/cmdlist.h
+		exec - then ${STDCP} cmdlist.h ${PACKAGE_ast_INCLUDE}/cmdlist.h
 		exec - fi
 	done ${PACKAGE_ast_INCLUDE}/cmdlist.h generated
 done install virtual
diff --git a/src/lib/libcmd/vmstate.c b/src/lib/libcmd/vmstate.c
index 656706cc0..41d2dbab5 100644
--- a/src/lib/libcmd/vmstate.c
+++ b/src/lib/libcmd/vmstate.c
@@ -24,7 +24,9 @@
 #include <vmalloc.h>
 #include <sfdisc.h>
 
-#if !_std_malloc  /* do not pointlessly compile this if vmalloc is disabled */
+#if _std_malloc  /* do not pointlessly compile this if vmalloc is disabled */
+void _STUB_vmstate(){}
+#else
 
 #define FORMAT		"region=%(region)p method=%(method)s flags=%(flags)s size=%(size)d segments=%(segments)d busy=(%(busy_size)d,%(busy_blocks)d,%(busy_max)d) free=(%(free_size)d,%(free_blocks)d,%(free_max)d)"
 
diff --git a/src/lib/libdll/Mamfile b/src/lib/libdll/Mamfile
index 7454194ae..0d918ca83 100644
--- a/src/lib/libdll/Mamfile
+++ b/src/lib/libdll/Mamfile
@@ -146,7 +146,7 @@ make install
 							bind -last
 							exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdl} ${mam_libast} : run features/dll
 						done FEATURE/dll generated
-						exec - cmp 2>/dev/null -s FEATURE/dll dlldefs.h || { rm -f dlldefs.h; silent test -d . || mkdir .; cp FEATURE/dll dlldefs.h; }
+						exec - cmp -s FEATURE/dll dlldefs.h || { rm -f dlldefs.h; silent test -d . || mkdir .; cp FEATURE/dll dlldefs.h; }
 					done dlldefs.h generated
 					prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 				done dlfcn.c
@@ -285,9 +285,8 @@ make install
 	make ${PACKAGE_ast_INCLUDE}/dlldefs.h
 		prev ${PACKAGE_ast_INCLUDE}
 		prev dlldefs.h
-		exec - if cmp 2>/dev/null -s dlldefs.h ${PACKAGE_ast_INCLUDE}/dlldefs.h
-		exec - then :
-		exec - else ${STDCP} dlldefs.h ${PACKAGE_ast_INCLUDE}/dlldefs.h
+		exec - if ! cmp -s dlldefs.h ${PACKAGE_ast_INCLUDE}/dlldefs.h
+		exec - then ${STDCP} dlldefs.h ${PACKAGE_ast_INCLUDE}/dlldefs.h
 		exec - fi
 	done ${PACKAGE_ast_INCLUDE}/dlldefs.h generated
 done install virtual
diff --git a/src/lib/libsum/Mamfile b/src/lib/libsum/Mamfile
index dd8eeaa50..74992eba8 100644
--- a/src/lib/libsum/Mamfile
+++ b/src/lib/libsum/Mamfile
@@ -212,9 +212,8 @@ make install
 	make ${PACKAGE_ast_INCLUDE}/sum.h
 		prev ${PACKAGE_ast_INCLUDE}
 		prev sum.h
-		exec - if cmp 2>/dev/null -s sum.h ${PACKAGE_ast_INCLUDE}/sum.h
-		exec - then :
-		exec - else ${STDCP} sum.h ${PACKAGE_ast_INCLUDE}/sum.h
+		exec - if ! cmp -s sum.h ${PACKAGE_ast_INCLUDE}/sum.h
+		exec - then ${STDCP} sum.h ${PACKAGE_ast_INCLUDE}/sum.h
 		exec - fi
 	done ${PACKAGE_ast_INCLUDE}/sum.h generated
 done install virtual