Skip to content

Commit

Permalink
Moar minor cleanups
Browse files Browse the repository at this point in the history
Notable changes:

bin/package:
- In 'package results' output, don't show lines starting with
  'conf: probe' or 'conf: test'; that's normal comp/conf.sh output.

src/cmd/INIT/iffe.sh,
src/cmd/INIT/mamprobe.sh,
src/cmd/ksh93/DESIGN:
- Remove outdated nmake stuff from (self-)doc.
- Update to match current build system.

src/cmd/ksh93/sh.1:
- Remove outdated stuff about removed suid_exec. (re: 09811da)
  At least I think that was about suid_exec; it's very vague.
  • Loading branch information
McDutchie committed Feb 11, 2024
1 parent 1522c8d commit 19af097
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 77 deletions.
6 changes: 3 additions & 3 deletions bin/package
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ command=${0##*/}
case $(getopts '[-][123:xyz]' opt --xyz 2>/dev/null; echo 0$opt) in
0123) USAGE=$'
[-?
@(#)$Id: '$command$' (ksh 93u+m) 2024-01-22 $
@(#)$Id: '$command$' (ksh 93u+m) 2024-02-11 $
]
[-author?Glenn Fowler <[email protected]>]
[-author?Contributors to https://github.com/ksh93/ksh]
Expand Down Expand Up @@ -543,7 +543,7 @@ SEE ALSO
pkgadd(1), pkgmk(1), rpm(1), sh(1), tar(1), optget(3)

IMPLEMENTATION
version package (ksh 93u+m) 2024-01-22
version package (ksh 93u+m) 2024-02-11
author Glenn Fowler <[email protected]>
author Contributors to https://github.com/ksh93/ksh
copyright (c) 1994-2012 AT&T Intellectual Property
Expand Down Expand Up @@ -3251,7 +3251,7 @@ results)set -- $target
case $filter in
errors) $exeg grep -E '^pax:|\*\*\*' $j
;;
*) $exec grep -E -iv '^($||[\+\[]|cc[^-:]|kill |make.*(file system time|has been replaced)|so|[0123456789]+ error|uncrate |[0123456789]+ block|ar: creat|iffe: test: |conf: (check|generate|test)|[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789]*=|gsf@research|ar:.*warning|cpio:|ld:.*(duplicate symbol|to obtain more information)|[0123456789]*$|(checking|creating|touch) [/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789])| obsolete predefined symbol | is (almost always misused|dangerous|deprecated|not implemented)| trigraph| assigned to | cast .* different size| integer overflow .*<<| optimization may be attained | passed as |::__builtin|^creating.*\.a$|warning.*not optimized|exceeds size thresh|ld:.*preempts|is unchanged|with value >=|(-l|lib)\*|/(ast|sys)/(dir|limits|param|stropts)\.h.*redefined|usage|base registers|`\.\.\.` obsolete'"$i" $j |
*) $exec grep -E -iv '^($||[\+\[]|cc[^-:]|kill |make.*(file system time|has been replaced)|so|[0123456789]+ error|uncrate |[0123456789]+ block|ar: creat|iffe: test: |conf: (check|generate|read|probe|test)|[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789]*=|gsf@research|ar:.*warning|cpio:|ld:.*(duplicate symbol|to obtain more information)|[0123456789]*$|(checking|creating|touch) [/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789])| obsolete predefined symbol | is (almost always misused|dangerous|deprecated|not implemented)| trigraph| assigned to | cast .* different size| integer overflow .*<<| optimization may be attained | passed as |::__builtin|^creating.*\.a$|warning.*not optimized|exceeds size thresh|ld:.*preempts|is unchanged|with value >=|(-l|lib)\*|/(ast|sys)/(dir|limits|param|stropts)\.h.*redefined|usage|base registers|`\.\.\.` obsolete'"$i" $j |
$exec grep :
;;
esac
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/INIT/Mamfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ make install virtual
exec - *PLUGIN_LIB=*)
exec - p=$x ;;
exec - *) case $u in
exec - ?* u=$u$N ;;
exec - ?*) u=$u$N ;;
exec - esac
exec - u=$u$x ;;
exec - esac
Expand Down
15 changes: 5 additions & 10 deletions src/cmd/INIT/iffe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# #
# This software is part of the ast package #
# Copyright (c) 1994-2012 AT&T Intellectual Property #
# Copyright (c) 2020-2023 Contributors to ksh 93u+m #
# Copyright (c) 2020-2024 Contributors to ksh 93u+m #
# and is licensed under the #
# Eclipse Public License, Version 2.0 #
# #
Expand Down Expand Up @@ -653,7 +653,7 @@ case $( (getopts '[-][123:xyz]' opt --xyz; echo 0$opt) 2>/dev/null ) in
[-author?Phong Vo <[email protected]>]
[-author?Contributors to https://github.com/ksh93/ksh]
[-copyright?(c) 1994-2012 AT&T Intellectual Property]
[-copyright?(c) 2020-2023 Contributors to ksh 93u+m]
[-copyright?(c) 2020-2024 Contributors to ksh 93u+m]
[-license?https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html]
[+NAME?iffe - C compilation environment feature probe]
[+DESCRIPTION?\biffe\b is a command interpreter that probes the C
Expand Down Expand Up @@ -804,13 +804,8 @@ case $( (getopts '[-][123:xyz]' opt --xyz; echo 0$opt) 2>/dev/null ) in
\b'"$dir"$'/\b\abase\a.]
}
[+?Generated \biffe\b headers are often referenced in C source as:
\b#include "'"$dir"$'/\b\afile\a". The \bnmake\b(1) base rules contain
metarules for generating \b'"$dir"$'/\b\afile\a from
\bfeatures/\b\afile\a[\asuffix\a]], where \asuffix\a may be omitted,
\b.c\b, or \b.sh\b (see the \brun\b test below). Because
\b#include\b prerequisites are automatically detected, \bnmake\b(1)
ensures that all prerequisite \biffe\b headers are generated before
compilation. Note that the directories are deliberately named
\b#include "'"$dir"$'/\b\afile\a".
Note that the directories are deliberately named
\b'"$dir"$'\b and \bfeatures\b to keep case-ignorant file systems
happy.]
[+?The feature tests are:]{
Expand Down Expand Up @@ -995,7 +990,7 @@ case $( (getopts '[-][123:xyz]' opt --xyz; echo 0$opt) 2>/dev/null ) in
\bendif\b } with unnamed \b{\b ... \b}\b blocks.]
}
[+SEE ALSO?\bautoconf\b(1), \bconfig\b(1), \bgetconf\b(1), \bcrossexec\b(1),
\bnmake\b(1), \bpackage\b(1), \bsh\b(1)]
\bpackage\b(1), \bsh\b(1)]
'
while getopts -a "$command" "$USAGE" OPT
do case $OPT in
Expand Down
11 changes: 4 additions & 7 deletions src/cmd/INIT/mamprobe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# #
# This software is part of the ast package #
# Copyright (c) 1994-2011 AT&T Intellectual Property #
# Copyright (c) 2020-2022 Contributors to ksh 93u+m #
# Copyright (c) 2020-2024 Contributors to ksh 93u+m #
# and is licensed under the #
# Eclipse Public License, Version 2.0 #
# #
Expand Down Expand Up @@ -37,7 +37,7 @@ opt=
case `(getopts '[-][123:xyz]' opt --xyz; echo 0$opt) 2>/dev/null` in
0123) USAGE=$'
[-?
@(#)$Id: mamprobe (ksh 93u+m) 2022-10-26 $
@(#)$Id: mamprobe (ksh 93u+m) 2024-02-10 $
]
[+NAME?mamprobe - generate MAM cc probe info]
[+DESCRIPTION?\bmamprobe\b generates MAM (make abstract machine) \bcc\b(1)
Expand All @@ -48,10 +48,7 @@ case `(getopts '[-][123:xyz]' opt --xyz; echo 0$opt) 2>/dev/null` in
of \acc-path\a. Any \ainfo-file\a directories are created if needed.
If \ainfo-file\a is \b-\b then the probe information is written to
the standard output.]
[+?\bmamprobe\b and \bmamake\b are used in the bootstrap phase of
\bpackage\b(1) installation before \bnmake\b(1) is built. The
probed variable names are the \bnmake\b(1) names with a \bmam_\b
prefix, \bCC\b converted to \bcc\b, and \b.\b converted to \b_\b.
[+?The probed variable names get a \bmam_\b prefix.
Additional variables are:]{
[+_hosttype_?the \bpackage\b(1) host type]
[+mam_cc_L?\b-L\b\adir\a supported]
Expand All @@ -69,7 +66,7 @@ case `(getopts '[-][123:xyz]' opt --xyz; echo 0$opt) 2>/dev/null` in
info-file cc-path
[+SEE ALSO?\bpackage\b(1), \bmamake\b(1), \bnmake\b(1), \bprobe\b(1)]
[+SEE ALSO?\bpackage\b(1), \bmamake\b(1), \bprobe\b(1)]
'
while getopts -a "$command" "$USAGE" OPT
do case $OPT in
Expand Down
20 changes: 10 additions & 10 deletions src/cmd/ksh93/DESIGN
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ Directory layout:

The directory tests contains a number of regression tests.
In most cases, when a bug gets fixed, a test is added to
one of these files. The regression tests can be run by
going to this directory and running
SHELL=shell_path shell_path shtests
where shell_path is an absolute pathname for the shell to
be tested.
one of these files. The ksh regression tests can be run by
invoking the shtests script in the top-level bin directory;
see 'bin/shtests --man' for documentation about the options.
They are also run with default options via 'bin/package tests'
as part of a complete test suite run that also includes tests
for the build system itself.

The top level directory contains the nmake Makefile, the
RELEASE file, the ksh93 man file (sh.1) and nval.3 and shell.3
documentation files. The RELEASE file contains the list of bug
fixes and new features since the original ksh93 release. The file
COMPATIBILITY is a list of all known incompatibilities with ksh88.
The top level directory contains the mamake Mamfile, the ksh93
manual page (sh.1) and the nval.3 and shell.3 documentation files.
The file COMPATIBILITY is a list of all known incompatibilities
with previous AT&T releases.

Include directory:
1. argnod.h contains the type definitions for command
Expand Down
1 change: 1 addition & 0 deletions src/cmd/ksh93/bltins/print.c
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ int b_print(int argc, char *argv[], Shbltin_t *context)
nflag++;
argv++;
}
opt_info.disc = NULL;
goto skip2;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/ksh93/include/edit.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* *
* This software is part of the ast package *
* Copyright (c) 1982-2012 AT&T Intellectual Property *
* Copyright (c) 2020-2023 Contributors to ksh 93u+m *
* Copyright (c) 2020-2024 Contributors to ksh 93u+m *
* and is licensed under the *
* Eclipse Public License, Version 2.0 *
* *
Expand Down
10 changes: 0 additions & 10 deletions src/cmd/ksh93/sh.1
Original file line number Diff line number Diff line change
Expand Up @@ -4573,16 +4573,6 @@ file,
it is assumed to be a file containing shell commands.
A separate shell is spawned to read it.
All non-exported variables are removed in this case.
If the shell command
file doesn't have read permission,
or if the
.I setuid
and/or
.I setgid
bits are set on the file,
then the shell executes an agent whose job it is to
set up the permissions and execute the shell with the
shell command file passed down as an open file.
If the
.B .paths
contains a line of the form
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/ksh93/tests/subshell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# #
# This software is part of the ast package #
# Copyright (c) 1982-2012 AT&T Intellectual Property #
# Copyright (c) 2020-2023 Contributors to ksh 93u+m #
# Copyright (c) 2020-2024 Contributors to ksh 93u+m #
# and is licensed under the #
# Eclipse Public License, Version 2.0 #
# #
Expand Down
Loading

0 comments on commit 19af097

Please sign in to comment.