misc minor cleanups and copy-edits

Author: McDutchie

bin/package

@@ -27,7 +27,6 @@
 
 # Escape from a non-POSIX shell
 min_posix=/if/this/is/csh/ignore/the/error/message || exec sh $0:q $argv:q
-# ('test X -ef Y' is technically non-POSIX, but practically universal)
 min_posix='test / -ef / && path=Bad && case $PATH in (Bad) exit 1;; esac && '\
 'PWD=Bad && cd -P -- / && case $PWD in (/) ;; (*) exit 1;; esac && '\
 '! { ! case x in ( x ) : ${0##*/} || : $( : ) ;; esac; } && '\

bin/shtests

@@ -9,7 +9,6 @@
 
 # Escape from a non-POSIX shell
 min_posix=/if/this/is/csh/ignore/the/error/message || exec sh $0:q $argv:q
-# ('test X -ef Y' is technically non-POSIX, but practically universal)
 min_posix='test / -ef / && path=Bad && case $PATH in (Bad) exit 1;; esac && '\
 'PWD=Bad && cd -P -- / && case $PWD in (/) ;; (*) exit 1;; esac && '\
 '! { ! case x in ( x ) : ${0##*/} || : $( : ) ;; esac; } && '\

src/cmd/INIT/README-mamake.md

@@ -1,7 +1,7 @@
 # mamake and the MAM language #
 
 MAM (Make Abstract Machine) is a simple rule-based make language
-that is implemented in just eight four-letter commands and four attributes,
+that is implemented in just ten four-letter commands and four attributes,
 yet allows unlimited flexibility as it can execute arbitrary shell code.
 The program implementing MAM, `mamake`,
 is a portable C90 program written in a single file, `mamake.c`.
@@ -273,8 +273,6 @@ The following *attribute*s are available:
 by *target* in a manner equivalent to an empty `make` *target*/`done` block,
 with the optional *attribute*s applied to the new rule. A nonexistent
 prerequisite is an error unless a `dontcare` attribute is given.
-Declaring a dependency on a prerequisite that is currently being made (i.e.:
-directly or indirectly within that prerequisite's block) is an error.
 
 ### Referencing previously defined rules ###
 
@@ -284,9 +282,12 @@ If *target* matches a previously defined rule, `prev` adds a dependency on
 that rule to the current rule. This is used to make a rule a prerequisite of
 multiple `make`...`done` blocks without repeating the rule. It is an error
 to specify attributes, because the attributes of the referenced rule are used.
-In the legacy mode, attributes are silently ignored.
+Declaring a dependency on a prerequisite that is currently being made (i.e.:
+directly or indirectly within that prerequisite's block) is an error.
 
-> *Obsolete:* If the strict level is < 4, and if *target* does not match a
+> *Obsolete:*
+> In the legacy mode, attributes are silently ignored.
+> If the strict level is < 4, and if *target* does not match a
 > previously defined rule, then the following applies. In the legacy mode,
 > `prev` creates an empty dummy rule and ignores the *attribute*s; this is
 > for backward compatibility. At strict levels 1 and up, `prev` in this
@@ -314,7 +315,8 @@ to probe the C compiler for flags and features,
 or uses that script's stored results if not outdated.
 The results are stored as a series of `setv` commands
 in a file in the directory `%{INSTALLROOT}/lib/probe/C/mam`,
-the file name being a hash of full path to the compiler indicated by `%{CC}`.
+the file name being a hash of the full path to the compiler
+as indicated by `%{CC}`.
 That results file is then read and included in the current Mamfile
 as if it followed the `setv CC` command.
 

src/cmd/INIT/mamake.c

@@ -2,7 +2,7 @@
 *                                                                      *
 *               This software is part of the ast package               *
 *          Copyright (c) 1990-2013 AT&T Intellectual Property          *
-*          Copyright (c) 2020-2025 Contributors to ksh 93u+m           *
+*          Copyright (c) 2020-2026 Contributors to ksh 93u+m           *
 *                      and is licensed under the                       *
 *                 Eclipse Public License, Version 2.0                  *
 *                                                                      *
@@ -43,7 +43,7 @@ static const char usage[] =
 "[-author?Martijn Dekker <martijn@inlv.org>]"
 "[-author?Contributors to https://github.com/ksh93/ksh]"
 "[-copyright?(c) 1994-2013 AT&T Intellectual Property]"
-"[-copyright?(c) 2020-2025 Contributors to ksh 93u+m]"
+"[-copyright?(c) 2020-2026 Contributors to ksh 93u+m]"
 "[-license?https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html]"
 "[+NAME?mamake - make abstract machine make]"
 "[+DESCRIPTION?\bmamake\b reads \amake abstract machine\a target and"
@@ -353,7 +353,7 @@ static void usage(void)
  * output error message identification
  */
 
-static void identify(FILE * sp)
+static void identify(FILE *sp)
 {
 	if (state.directory)
 		fprintf(sp, "%s [%s]: ", state.id, state.directory);
@@ -1792,16 +1792,13 @@ static void probe(Rule_t *r, Makestate_t *stp)
 	time_t		cmd_time, output_time;
 	Buf_t		*buf;
 	struct stat	st;
-	Rule_t		*mamprobe_r;
 
 	if (!(cc = getval(state.vars, "CC")))
 		cc = "cc";
 	buf = buffer();
-	append(buf, state.installroot), append(buf, "/bin/"), append(buf, "mamprobe");
+	append(buf, state.installroot), append(buf, "/bin/mamprobe");
 	cmd = duplicate(use(buf));
-	/* we may need to wait for mamprobe to be generated */
-	if (mamprobe_r = getval(state.rules, cmd))
-		reap(mamprobe_r, 0);
+	reap(getval(state.rules, cmd), 0);  /* we may need to wait for mamprobe to be generated */
 	cmd_time = stat(cmd, &st) ? 0 : st.st_mtime;
 	if (stat(cmd, &st) < 0)
 		error_out("not found", cmd);

src/cmd/INIT/mktest.sh

@@ -2,7 +2,7 @@
 #                                                                      #
 #               This software is part of the ast package               #
 #          Copyright (c) 1994-2011 AT&T Intellectual Property          #
-#          Copyright (c) 2020-2024 Contributors to ksh 93u+m           #
+#          Copyright (c) 2020-2026 Contributors to ksh 93u+m           #
 #                      and is licensed under the                       #
 #                 Eclipse Public License, Version 2.0                  #
 #                                                                      #

src/cmd/ksh93/include/name.h

@@ -2,7 +2,7 @@
 *                                                                      *
 *               This software is part of the ast package               *
 *          Copyright (c) 1982-2012 AT&T Intellectual Property          *
-*          Copyright (c) 2020-2025 Contributors to ksh 93u+m           *
+*          Copyright (c) 2020-2026 Contributors to ksh 93u+m           *
 *                      and is licensed under the                       *
 *                 Eclipse Public License, Version 2.0                  *
 *                                                                      *

src/cmd/ksh93/sh/init.c

@@ -2,7 +2,7 @@
 *                                                                      *
 *               This software is part of the ast package               *
 *          Copyright (c) 1982-2012 AT&T Intellectual Property          *
-*          Copyright (c) 2020-2025 Contributors to ksh 93u+m           *
+*          Copyright (c) 2020-2026 Contributors to ksh 93u+m           *
 *                      and is licensed under the                       *
 *                 Eclipse Public License, Version 2.0                  *
 *                                                                      *

src/cmd/ksh93/sh/name.c

@@ -2,7 +2,7 @@
 *                                                                      *
 *               This software is part of the ast package               *
 *          Copyright (c) 1982-2012 AT&T Intellectual Property          *
-*          Copyright (c) 2020-2025 Contributors to ksh 93u+m           *
+*          Copyright (c) 2020-2026 Contributors to ksh 93u+m           *
 *                      and is licensed under the                       *
 *                 Eclipse Public License, Version 2.0                  *
 *                                                                      *

src/cmd/ksh93/sh/subshell.c

@@ -2,7 +2,7 @@
 *                                                                      *
 *               This software is part of the ast package               *
 *          Copyright (c) 1982-2012 AT&T Intellectual Property          *
-*          Copyright (c) 2020-2025 Contributors to ksh 93u+m           *
+*          Copyright (c) 2020-2026 Contributors to ksh 93u+m           *
 *                      and is licensed under the                       *
 *                 Eclipse Public License, Version 2.0                  *
 *                                                                      *

src/cmd/ksh93/tests/variables.sh

@@ -2,7 +2,7 @@
 #                                                                      #
 #               This software is part of the ast package               #
 #          Copyright (c) 1982-2012 AT&T Intellectual Property          #
-#          Copyright (c) 2020-2025 Contributors to ksh 93u+m           #
+#          Copyright (c) 2020-2026 Contributors to ksh 93u+m           #
 #                      and is licensed under the                       #
 #                 Eclipse Public License, Version 2.0                  #
 #                                                                      #
@@ -1709,7 +1709,7 @@ got=$(./issue861.sh 2>&1)
 	"(got status $e, $(printf %q "$got"))"
 unset i
 
-# ======'"
+# ======
 
 # Problem: the global discipline function kept applying to the local variable
 # for certain special variables. This was a design problem with nv_cover() in