Yet more accumulated minor cleanups

...including:
- A bunch more cosmetic whitespace fixes
- src/cmd/ksh93/{init,main}.c: Fix the location of a comment about
  executing a #!-less script that got moved to the wrong place in
  ancient times
- src/cmd/ksh93/tests/coprocess.sh: Remove a libcoshell test that
  failed to fail after removing libcoshell (re: 3613da4)

Author: McDutchie

COPYRIGHT

@@ -23,16 +23,16 @@ ksh 93u+m general copyright notice
 #                      Phi <[email protected]>                      #
 #          atheik <[email protected]>           #
 #               Vincent Mihalkovic <[email protected]>               #
-#             dnewhall <[email protected]>             #
 #                Ryan Schmidt <[email protected]>                #
 #                 Harald van Dijk <[email protected]>                 #
+#             dnewhall <[email protected]>             #
 #                   Chase <[email protected]>                   #
-#           rymrg <[email protected]>            #
-#       hyousatsu <[email protected]>       #
 #                      Trey Valenta <[email protected]>                       #
 #  Sterling Jensen <[email protected]>   #
 #            SHIMIZU Akifumi <[email protected]>             #
+#           rymrg <[email protected]>            #
 #                   Marc Wilson <[email protected]>                   #
+#       hyousatsu <[email protected]>       #
 #                Govind Kamat <[email protected]>                 #
 #                     Cy Schubert <[email protected]>                     #
 #                  Andy Fiddaman <[email protected]>                   #
@@ -45,6 +45,7 @@ ksh 93u+m general copyright notice
 #              Siteshwar Vashisht <[email protected]>               #
 #                 Kurtis Rader <[email protected]>                  #
 #               Roland Mainz <[email protected]>                #
+#                 Paulo Andrade <[email protected]>                  #
 #                Finnbarr P. Murphy <[email protected]>                  #
 #               Lijo George <[email protected]>                 #
 #                Perette Barella <[email protected]>                 #

bin/package

@@ -390,7 +390,7 @@ do	case $# in
 		set -x
 		;;
 	help|HELP|html|man|--[?m]*)
-                case $1 in
+		case $1 in
 		help)	case $2 in
 			'')	exec 1>&2 ;;
 			esac

src/cmd/INIT/README-mamake.md

@@ -586,15 +586,16 @@ maintain Mamfiles by hand. The following lists the important changes.
   block to declare a simple prerequisite with optional attributes.
 * The special expansion syntaxes `%{`*variable*`|`*sh-script*`}` and
   `%{`*variable*`@`*sh-script*`}` have been added, allowing the editing of
-  variable value fields written to the script's standard input as lines or
-  passed as positional parameters.
+  variable value fields. The fields are either written to the script's
+  standard input as lines, or passed as positional parameters.
 * **At strict level 1 and up:**
     * Appending attributes to `done` instead of `make` is deprecated
       and produces a warning.
     * The ignored `archive` and `joint` attributes are deprecated.
     * Explicitly specifying the `generated` attribute is deprecated.
     * The dummy `info` and `meta` commands are unavailable instead of ignored.
-    * The `prev` may be used as an equivalent of `makp`.
+    * The `prev` command may be used to declare a dependency on a prerequisite
+      file. (This change is reverted at strict level 4 as `makp` was added.)
     * When `prev` references a previously processed target,
       attributes are an error instead of being ignored.
     * The legacy `silent` and `ignore` command prefixes are unavailable.
@@ -611,7 +612,8 @@ maintain Mamfiles by hand. The following lists the important changes.
     * Attempting to declare a dependency on a rule currently being made is an error.
 * **At strict level 4 and up:**
     * MAM expansions can no longer start with `${`. Only `%{` is recognized.
-    * The `prev` command may no longer be used as an equivalent of `makp`.
+    * The `prev` command may no longer be used to declare a dependency on a
+      prerequisite file. The newly added command `makp` should be used instead.
     * The `implicit` attribute is not available.
 * **At strict level 5 and up:**
     * The new `-j` option for parallel building is allowed to take effect.

src/cmd/INIT/mamake.c

@@ -186,6 +186,8 @@ static const char usage[] =
 #define STREAM_MUST	0x0002		/* push() file must exist	*/
 #define STREAM_PIPE	0x0004		/* pclose() on pop()		*/
 
+#define LIB_VARPREFIX	"mam_lib"	/* prefix for dependencies vars	*/
+
 struct Rule_s;
 
 typedef struct Buf_s			/* buffer stream		*/
@@ -1117,7 +1119,8 @@ static void substitute(Buf_t *buf, char *s)
 				{	/*
 					 * Perform the expansion: append the value of the variable to the buffer.
 					 */
-					if (state.strict < 2 && found_AR && strncmp(t, "mam_lib", 7) == 0)
+					if (state.strict < 2 && found_AR &&
+						strncmp(t, LIB_VARPREFIX, sizeof LIB_VARPREFIX - 1) == 0)
 					{	/*
 						 * Absurd AT&T hack from 2007. The relevant src/cmd/INIT/RELEASE entry:
 						 *	07-02-26 mamake.c: expand first of ${mam_lib*} for ${AR}
@@ -1918,8 +1921,6 @@ void append_ar_name(Buf_t *buf, char *name)
  * lib is expected to be in the format "-lX"
  */
 
-#define LIB_VARPREFIX "mam_lib"
-
 static char *require(char *lib, int dontcare)
 {
 	char		*s, *r, varname[64];

src/cmd/ksh93/bltins/typeset.c

@@ -217,7 +217,6 @@ int    b_alias(int argc,char *argv[],Shbltin_t *context)
     int    b_float(int argc,char *argv[],Shbltin_t *context){}
     int    b_functions(int argc,char *argv[],Shbltin_t *context){}
     int    b_integer(int argc,char *argv[],Shbltin_t *context){}
-    int    b_local(int argc,char *argv[],Shbltin_t *context){}
     int    b_nameref(int argc,char *argv[],Shbltin_t *context){}
 #endif
 int    b_typeset(int argc,char *argv[],Shbltin_t *context)

src/cmd/ksh93/data/builtins.c

@@ -593,9 +593,9 @@ const char sh_optdot[]	 =
 "[+SEE ALSO?\bcommand\b(1), \bksh\b(1)]"
 ;
 
-#ifndef ECHOPRINT
+#if !SHOPT_ECHOPRINT
     const char sh_optecho[]	= " [-n] [arg...]";
-#endif /* !ECHOPRINT */
+#endif
 
 const char sh_opteval[] =
 "[-1c?\n@(#)$Id: eval (AT&T Research) 1999-07-07 $\n]"

src/cmd/ksh93/include/builtins.h

@@ -154,9 +154,9 @@ extern const char sh_optcd[];
 extern const char sh_optcommand[];
 extern const char sh_optcont[];
 extern const char sh_optdot[];
-#ifndef ECHOPRINT
+#if !SHOPT_ECHOPRINT
     extern const char sh_optecho[];
-#endif /* !ECHOPRINT */
+#endif
 extern const char sh_optenum[];
 extern const char sh_opteval[];
 extern const char sh_optexec[];

src/cmd/ksh93/include/edit.h

@@ -28,7 +28,7 @@
 #define SEARCHSIZE	80
 
 #include	"FEATURE/cmds"
-#include        "FEATURE/locale"
+#include	"FEATURE/locale"
 #include	"terminal.h"
 
 #define STRIP		0377

src/cmd/ksh93/include/variables.h

@@ -19,7 +19,7 @@
 
 #ifndef SH_VALNOD
 
-#include        <option.h>
+#include	<option.h>
 #include	<nval.h>
 
 /* used for RANDNOD ($RANDOM) */

src/cmd/ksh93/sh/init.c

@@ -29,16 +29,16 @@
  */
 
 #include	"shopt.h"
-#include        "defs.h"
-#include        <pwd.h>
-#include        <tmx.h>
-#include        <regex.h>
+#include	"defs.h"
+#include	<pwd.h>
+#include	<tmx.h>
+#include	<regex.h>
 #include	<math.h>
 #include	<ast_random.h>
-#include        "variables.h"
-#include        "path.h"
-#include        "fault.h"
-#include        "name.h"
+#include	"variables.h"
+#include	"path.h"
+#include	"fault.h"
+#include	"name.h"
 #include	"edit.h"
 #include	"jobs.h"
 #include	"io.h"
@@ -1345,10 +1345,6 @@ Shell_t *sh_init(int argc,char *argv[], Shinit_f userinit)
 		sh.shname = sh_strdup(argv[0]);
 	else
 		sh.shname = sh_strdup(sh.st.dolv[0]);
-	/*
-	 * return here for shell script execution
-	 * but not for parenthesis subshells
-	 */
 	error_info.id = sh_strdup(sh.st.dolv[0]); /* error_info.id is $0 */
 	sh.jmpbuffer = &sh.checkbase;
 	sh_pushcontext(&sh.checkbase,SH_JMPSCRIPT);
@@ -1554,7 +1550,7 @@ void sh_reinit(void)
 }
 
 /*
- * set when creating a local variable of this name
+ * return discipline function tree pointer if a local variable of this name should share the parent's discipline function(s)
  */
 Namfun_t *nv_cover(Namval_t *np)
 {