From e92faddbf9d3efbee1503edc3cc2994eababd88d Mon Sep 17 00:00:00 2001 From: Johnothan King Date: Wed, 10 Jun 2020 05:16:53 -0700 Subject: [PATCH] Fix 39 spelling errors and a formatting issue A column of whitespace in the NEWS file was removed for consistent formatting. Most of the spelling errors were found with this codespell dictionary: https://github.com/orbitcowboy/codespell_dictionary (cherry picked from commit 0e36b17abe5609c461a3e4da7041eb0fdf9991b7) --- NEWS | 28 ++++++++++++++-------------- docs/ksh/faq.html | 2 +- lib/package/INIT.README | 6 +++--- lib/package/INIT.html | 6 +++--- lib/package/ast-open.README | 6 +++--- lib/package/ast-open.html | 6 +++--- src/cmd/INIT/RELEASE | 6 +++--- src/cmd/INIT/ditto.sh | 2 +- src/cmd/ksh93/RELEASE | 4 ++-- src/cmd/ksh93/RELEASE93 | 2 +- src/cmd/ksh93/data/builtins.c | 2 +- src/cmd/ksh93/sh.1 | 2 +- src/cmd/ksh93/sh/suid_exec.c | 2 +- src/cmd/ksh93/tests/io.sh | 2 +- src/cmd/ksh93/tests/restricted.sh | 12 ++++++------ src/cmd/ksh93/tests/signal.sh | 2 +- src/lib/libast/RELEASE | 2 +- src/lib/libast/include/cdt.h | 2 +- src/lib/libast/man/aso.3 | 6 +++--- src/lib/libast/man/proc.3 | 2 +- src/lib/libast/string/strtoi.h | 2 +- src/lib/libcmd/cut.c | 2 +- 22 files changed, 53 insertions(+), 53 deletions(-) diff --git a/NEWS b/NEWS index 82f1824fd..5090b44a5 100644 --- a/NEWS +++ b/NEWS @@ -11,20 +11,20 @@ Any uppercase BUG_* names are modernish shell bug IDs. 2020-06-08: - - Fix an issue with the up arrow key in Emacs editing mode. - Emacs editing mode is bugged in ksh93u+ and ksh2020. Let's - say you were to run the following commands after starting - a fresh instance of ksh: - $ alias foo='true' - $ unalias foo - If you type 'a' and then press the up arrow on your keyboard, - ksh will complete 'a' to `alias foo='true'` by doing a reverse - search for the last command that starts with 'a'. - Run the alias command again, then type 'u' and press the up - arrow key again. If ksh is in Vi mode, you will get `unalias foo`, - but in Emacs mode you will get `alias foo='true'` again. - All subsequent commands were ignored as ksh was saving the first - command and only based later searches off of it. +- Fix an issue with the up arrow key in Emacs editing mode. + Emacs editing mode is bugged in ksh93u+ and ksh2020. Let's + say you were to run the following commands after starting + a fresh instance of ksh: + $ alias foo='true' + $ unalias foo + If you type 'a' and then press the up arrow on your keyboard, + ksh will complete 'a' to `alias foo='true'` by doing a reverse + search for the last command that starts with 'a'. + Run the alias command again, then type 'u' and press the up + arrow key again. If ksh is in Vi mode, you will get `unalias foo`, + but in Emacs mode you will get `alias foo='true'` again. + All subsequent commands were ignored as ksh was saving the first + command and only based later searches off of it. - If 'set -u'/'set -o nounset' is active, then the shell now errors out if a nonexistent positional parameter such as $1, $2, ... is accessed, as other diff --git a/docs/ksh/faq.html b/docs/ksh/faq.html index e540e8086..43319e28f 100644 --- a/docs/ksh/faq.html +++ b/docs/ksh/faq.html @@ -247,7 +247,7 @@ Some KornShell scripts will not run with pdksh.
How is the MKS Toolkit KornShell related to KornShell?
-MKS Tookit KornShell is a completely independent implementation +MKS Toolkit KornShell is a completely independent implementation that supports a subset of the 1988 KornShell language.
What systems does ksh run on?
diff --git a/lib/package/INIT.README b/lib/package/INIT.README index cc7490d8b..73411ec17 100644 --- a/lib/package/INIT.README +++ b/lib/package/INIT.README @@ -150,7 +150,7 @@ All recorded changes follow. 10-11-22 ditto.sh: fix timing problem between |& and exec &p 10-11-10 package.sh: fix cc cross compile check to use checkcc absolute path 10-10-10 package.sh: list main env vars at start of make action -10-10-10 ratz.c: tweak widnows delays +10-10-10 ratz.c: tweak windows delays 10-09-10 ratz.c: add _SEAR_ARGS for _SEAR_EXEC 10-09-01 package.sh: fix ratz from source logic 10-08-25 package.mk: consolidate license file search in .package.licenses. @@ -520,7 +520,7 @@ All recorded changes follow. 03-09-11 iffe.sh: add unnamed { ... } blocks regress.sh: add COPY from to, like MOVE but comprison still done regress.sh: rm -rfu to handle test dirs w/o u+rwx -03-08-14 Makfile: add hello.c to the manifest +03-08-14 Makefile: add hello.c to the manifest 03-08-11 package.sh: fix `html binary' generation 03-06-21 package.sh: fix INITROOT initialization bug package.sh: make sure admin logs exists before tail'ing @@ -855,7 +855,7 @@ All recorded changes follow. 00-09-21 mamake: add libxxx and xxx to makefile ordered prereqs 00-09-19 C+probe: add probe_longlong 00-09-11 package: drop manmake and $PACKAGEROOT/bin/nmake -00-09-08 iffe: verfiy that $cc is a C compiler +00-09-08 iffe: verify that $cc is a C compiler 00-06-14 mamprobe: fix win32.* probe mamake: fix bug that used lower view path for generation package: don't clobber $PACKAGEROOT/bin/nmake diff --git a/lib/package/INIT.html b/lib/package/INIT.html index 6ea280a8f..315dbce8d 100644 --- a/lib/package/INIT.html +++ b/lib/package/INIT.html @@ -112,7 +112,7 @@ All recorded changes follow. 10-11-22 ditto.sh: fix timing problem between |& and exec &p 10-11-10 package.sh: fix cc cross compile check to use checkcc absolute path 10-10-10 package.sh: list main env vars at start of make action -10-10-10 ratz.c: tweak widnows delays +10-10-10 ratz.c: tweak windows delays 10-09-10 ratz.c: add _SEAR_ARGS for _SEAR_EXEC 10-09-01 package.sh: fix ratz from source logic 10-08-25 package.mk: consolidate license file search in .package.licenses. @@ -482,7 +482,7 @@ All recorded changes follow. 03-09-11 iffe.sh: add unnamed { ... } blocks regress.sh: add COPY from to, like MOVE but comprison still done regress.sh: rm -rfu to handle test dirs w/o u+rwx -03-08-14 Makfile: add hello.c to the manifest +03-08-14 Makefile: add hello.c to the manifest 03-08-11 package.sh: fix `html binary' generation 03-06-21 package.sh: fix INITROOT initialization bug package.sh: make sure admin logs exists before tail'ing @@ -817,7 +817,7 @@ All recorded changes follow. 00-09-21 mamake: add libxxx and xxx to makefile ordered prereqs 00-09-19 C+probe: add probe_longlong 00-09-11 package: drop manmake and $PACKAGEROOT/bin/nmake -00-09-08 iffe: verfiy that $cc is a C compiler +00-09-08 iffe: verify that $cc is a C compiler 00-06-14 mamprobe: fix win32.* probe mamake: fix bug that used lower view path for generation package: don't clobber $PACKAGEROOT/bin/nmake diff --git a/lib/package/ast-open.README b/lib/package/ast-open.README index 481e5050e..f20fae315 100644 --- a/lib/package/ast-open.README +++ b/lib/package/ast-open.README @@ -1091,7 +1091,7 @@ All recorded changes follow. no longer causes an error. It now is used for the "showme" option. 09-09-09 A bug in which a subshell containing a background process could block until the background process completed has been fixed. -09-09-04 A bug in handing ${var[sub]}, where var is a nameref has been fixed. +09-09-04 A bug in handling ${var[sub]}, where var is a nameref has been fixed. 09-09-03 A bug which caused an index array to have the wrong number of elements when it was converted from a compound variable by adding an another element has been fixed. @@ -2470,7 +2470,7 @@ All recorded changes follow. evaluation. It has higher precedence than * and is left associative. 01-09-25 The code was modified to use the ast multibyte macros - and functions for handing multibyte locales. + and functions for handling multibyte locales. 01-09-25 +The expansion ${parameter:offset:length} now handles negative offsets which cause offsets to be measured from the end. 01-09-25 Some spelling errors in the documentation were corrected. @@ -8287,7 +8287,7 @@ All recorded changes follow. 01-02-08 sfgetm,sfputm,_sfputm: fix max clash with k&r max() macro setlocale: undef valid for sun4 k&r valid() macro 01-02-07 catopen.c: don't do native catopen for the debug locale -01-02-06 sfraise.c: add SF_FINAL check to avoid (posibly) freed disciplines +01-02-06 sfraise.c: add SF_FINAL check to avoid (possibly) freed disciplines 01-01-01 features/common: fix uwin __DEFINE__ sftable: initialize decimal and thousand magic.tab: add corel wordperfect document diff --git a/lib/package/ast-open.html b/lib/package/ast-open.html index 063bc62b0..c71fc5610 100644 --- a/lib/package/ast-open.html +++ b/lib/package/ast-open.html @@ -1989,7 +1989,7 @@ All recorded changes follow. no longer causes an error. It now is used for the "showme" option. 09-09-09 A bug in which a subshell containing a background process could block until the background process completed has been fixed. -09-09-04 A bug in handing ${var[sub]}, where var is a nameref has been fixed. +09-09-04 A bug in handling ${var[sub]}, where var is a nameref has been fixed. 09-09-03 A bug which caused an index array to have the wrong number of elements when it was converted from a compound variable by adding an another element has been fixed. @@ -3368,7 +3368,7 @@ All recorded changes follow. evaluation. It has higher precedence than * and is left associative. 01-09-25 The code was modified to use the ast multibyte macros - and functions for handing multibyte locales. + and functions for handling multibyte locales. 01-09-25 +The expansion ${parameter:offset:length} now handles negative offsets which cause offsets to be measured from the end. 01-09-25 Some spelling errors in the documentation were corrected. @@ -9344,7 +9344,7 @@ All recorded changes follow. 01-02-08 sfgetm,sfputm,_sfputm: fix max clash with k&r max() macro setlocale: undef valid for sun4 k&r valid() macro 01-02-07 catopen.c: don't do native catopen for the debug locale -01-02-06 sfraise.c: add SF_FINAL check to avoid (posibly) freed disciplines +01-02-06 sfraise.c: add SF_FINAL check to avoid (possibly) freed disciplines 01-01-01 features/common: fix uwin __DEFINE__ sftable: initialize decimal and thousand magic.tab: add corel wordperfect document diff --git a/src/cmd/INIT/RELEASE b/src/cmd/INIT/RELEASE index aa9947276..70cd19596 100644 --- a/src/cmd/INIT/RELEASE +++ b/src/cmd/INIT/RELEASE @@ -55,7 +55,7 @@ 10-11-22 ditto.sh: fix timing problem between |& and exec &p 10-11-10 package.sh: fix cc cross compile check to use checkcc absolute path 10-10-10 package.sh: list main env vars at start of make action -10-10-10 ratz.c: tweak widnows delays +10-10-10 ratz.c: tweak windows delays 10-09-10 ratz.c: add _SEAR_ARGS for _SEAR_EXEC 10-09-01 package.sh: fix ratz from source logic 10-08-25 package.mk: consolidate license file search in .package.licenses. @@ -425,7 +425,7 @@ 03-09-11 iffe.sh: add unnamed { ... } blocks regress.sh: add COPY from to, like MOVE but comprison still done regress.sh: rm -rfu to handle test dirs w/o u+rwx -03-08-14 Makfile: add hello.c to the manifest +03-08-14 Makefile: add hello.c to the manifest 03-08-11 package.sh: fix `html binary' generation 03-06-21 package.sh: fix INITROOT initialization bug package.sh: make sure admin logs exists before tail'ing @@ -760,7 +760,7 @@ 00-09-21 mamake: add libxxx and xxx to makefile ordered prereqs 00-09-19 C+probe: add probe_longlong 00-09-11 package: drop manmake and $PACKAGEROOT/bin/nmake -00-09-08 iffe: verfiy that $cc is a C compiler +00-09-08 iffe: verify that $cc is a C compiler 00-06-14 mamprobe: fix win32.* probe mamake: fix bug that used lower view path for generation package: don't clobber $PACKAGEROOT/bin/nmake diff --git a/src/cmd/INIT/ditto.sh b/src/cmd/INIT/ditto.sh index 1141a0d7d..312f7022a 100644 --- a/src/cmd/INIT/ditto.sh +++ b/src/cmd/INIT/ditto.sh @@ -53,7 +53,7 @@ case `(getopts '[-][123:xyz]' opt --xyz; echo 0$opt) 2>/dev/null` in [d:delete?Delete \adestination\a files that are not in the \asource\a.] [e:expr?\btw\b(1) select expression.]:[tw-expression] [m!:mode?Preserve file mode.] -[n:show?Show the operations but do not exectute.] +[n:show?Show the operations but do not execute.] [o:owner?Preserve file user and group ownership.] [p:physical?Generate source and destination hierarchies by \btw\b(1) with the \b--physical\b option.] diff --git a/src/cmd/ksh93/RELEASE b/src/cmd/ksh93/RELEASE index e8c9caf99..e8336d689 100644 --- a/src/cmd/ksh93/RELEASE +++ b/src/cmd/ksh93/RELEASE @@ -995,7 +995,7 @@ no longer causes an error. It now is used for the "showme" option. 09-09-09 A bug in which a subshell containing a background process could block until the background process completed has been fixed. -09-09-04 A bug in handing ${var[sub]}, where var is a nameref has been fixed. +09-09-04 A bug in handling ${var[sub]}, where var is a nameref has been fixed. 09-09-03 A bug which caused an index array to have the wrong number of elements when it was converted from a compound variable by adding an another element has been fixed. @@ -2374,7 +2374,7 @@ evaluation. It has higher precedence than * and is left associative. 01-09-25 The code was modified to use the ast multibyte macros - and functions for handing multibyte locales. + and functions for handling multibyte locales. 01-09-25 +The expansion ${parameter:offset:length} now handles negative offsets which cause offsets to be measured from the end. 01-09-25 Some spelling errors in the documentation were corrected. diff --git a/src/cmd/ksh93/RELEASE93 b/src/cmd/ksh93/RELEASE93 index 04ae78a9b..9cefe8685 100644 --- a/src/cmd/ksh93/RELEASE93 +++ b/src/cmd/ksh93/RELEASE93 @@ -200,7 +200,7 @@ of ksh. positioned for the last command of a script has been fixed. y. A bug in the edit modes which allowed walking back in the history file for more than HISTSIZE commands has - beed fixed. + been fixed. z. A bug which could cause a core dump if variable TMPDIR was changed between two command substitutions has been fixed. aa. A bug which prevented a trap on EXIT from being cleared diff --git a/src/cmd/ksh93/data/builtins.c b/src/cmd/ksh93/data/builtins.c index e92b9e5ae..ef64e90fe 100644 --- a/src/cmd/ksh93/data/builtins.c +++ b/src/cmd/ksh93/data/builtins.c @@ -1378,7 +1378,7 @@ USAGE_LICENSE "[+?If the neither \b-s\b nor \b-c\b is specified, then the first \barg\b " "will be the pathname of the file containing commands and \b$0\b " "will be set to this value. If there is no file with this pathname, " - "and this pathame does not contain a \b/\b, then the \bPATH\b " + "and this pathname does not contain a \b/\b, then the \bPATH\b " "will be searched for an executable with this name. Any remaining " "\aarg\as will be used to initialize the positional parameters.]" "[+?Any option can use a \b+\b instead of a \b-\b to disable the corresponding " diff --git a/src/cmd/ksh93/sh.1 b/src/cmd/ksh93/sh.1 index 837299e8f..3732af0be 100644 --- a/src/cmd/ksh93/sh.1 +++ b/src/cmd/ksh93/sh.1 @@ -2427,7 +2427,7 @@ expands to the 8 fields, .BR z01cx , .B z04bx and -.BR z4cx . +.BR z04cx . .SS File Name Generation. Following splitting, each field is scanned for the characters .BR \(** , diff --git a/src/cmd/ksh93/sh/suid_exec.c b/src/cmd/ksh93/sh/suid_exec.c index d2160483a..fb5dad4ea 100644 --- a/src/cmd/ksh93/sh/suid_exec.c +++ b/src/cmd/ksh93/sh/suid_exec.c @@ -348,7 +348,7 @@ static void setids(int mode,int owner,int group) /* set effective uid even if S_ISUID is not set. This is because * we are *really* executing EUID root at this point. Even if S_ISUID - * is not set, the value for owner that is passsed should be correct. + * is not set, the value for owner that is passed should be correct. */ setreuid(ruserid,owner); } diff --git a/src/cmd/ksh93/tests/io.sh b/src/cmd/ksh93/tests/io.sh index 8b2721604..b5a2ae50e 100755 --- a/src/cmd/ksh93/tests/io.sh +++ b/src/cmd/ksh93/tests/io.sh @@ -292,7 +292,7 @@ $SHELL -c "$SHELL -c ': 3>&1' 1>&- 2>/dev/null" && err_exit 'closed standard out [[ $(cat <<- \EOF | $SHELL do_it_all() { - dd 2>/dev/null # not a ksh93 buildin + dd 2>/dev/null # not a ksh93 builtin return $? } do_it_all ; exit $? diff --git a/src/cmd/ksh93/tests/restricted.sh b/src/cmd/ksh93/tests/restricted.sh index 5d4571e1e..abf33cc82 100755 --- a/src/cmd/ksh93/tests/restricted.sh +++ b/src/cmd/ksh93/tests/restricted.sh @@ -58,12 +58,12 @@ ln -s $SHELL rksh PATH=$PWD:$PATH rksh -c '[[ -o restricted ]]' || err_exit 'restricted option not set' [[ $(rksh -c 'print hello') == hello ]] || err_exit 'unable to run print' -check_restricted "$binecho" || err_exit "$binecho not resticted" -check_restricted ./echo || err_exit './echo not resticted' -check_restricted 'SHELL=ksh' || err_exit 'SHELL assignment not resticted' -check_restricted 'PATH=/bin' || err_exit 'PATH assignment not resticted' -check_restricted 'FPATH=/bin' || err_exit 'FPATH assignment not resticted' -check_restricted 'ENV=/bin' || err_exit 'ENV assignment not resticted' +check_restricted "$binecho" || err_exit "$binecho not restricted" +check_restricted ./echo || err_exit './echo not restricted' +check_restricted 'SHELL=ksh' || err_exit 'SHELL assignment not restricted' +check_restricted 'PATH=/bin' || err_exit 'PATH assignment not restricted' +check_restricted 'FPATH=/bin' || err_exit 'FPATH assignment not restricted' +check_restricted 'ENV=/bin' || err_exit 'ENV assignment not restricted' check_restricted 'print > file' || err_exit '> file not restricted' > empty check_restricted 'print <> empty' || err_exit '<> file not restricted' diff --git a/src/cmd/ksh93/tests/signal.sh b/src/cmd/ksh93/tests/signal.sh index 260ef7918..de9637454 100755 --- a/src/cmd/ksh93/tests/signal.sh +++ b/src/cmd/ksh93/tests/signal.sh @@ -68,7 +68,7 @@ done EOF } | head > /dev/null (( $? == 0)) || err_exit "SIGPIPE with wrong error code $?" - # The below is kind of bogus as the err_exit from a bg job is never counterd. But see extra check below. + # The below is kind of bogus as the err_exit from a bg job is never counted. But see extra check below. [[ $(lockf\fP is \f50\fP and \f5(meth->type & ASO_INTRINSIC) != 0\fP @@ -332,7 +332,7 @@ if (data || !(asometh(0, 0)->type & (ASO_INTRINSIC|ASO_THREAD))) { else if (asoinit(meth, 0, 0, ASO_VERSION)) /* error -- method initialization error */; } -/* ready for \fIASO\fP operaions */ +/* ready for \fIASO\fP operations */ .Ce A multi-process application would check for \f5(ASO_INTRINSIC|ASO_PROCESS)\fP instead of \f5(ASO_INTRINSIC|ASO_THREAD)\fP. @@ -340,7 +340,7 @@ instead of \f5(ASO_INTRINSIC|ASO_THREAD)\fP. .PP .SH IMPLEMENTATION NOTES Unlike other \fIAST\fP library discipline/method functions which can instantiate -multiple discpline/method handles within a single process, the \fIASO\fP +multiple discipline/method handles within a single process, the \fIASO\fP library allows only one discipline and method to be set at a time, with the additional restriction that it may only be set by the main and only thread of the calling process. For this reason there is no open/close interface with an instantiation handle; diff --git a/src/lib/libast/man/proc.3 b/src/lib/libast/man/proc.3 index 5e747379f..580a198dc 100644 --- a/src/lib/libast/man/proc.3 +++ b/src/lib/libast/man/proc.3 @@ -195,7 +195,7 @@ Standard shell setup is done for the child process. .TP .L PROC_CLEANUP -Parent process redirection file discriptors are closed on error. +Parent process redirection file descriptors are closed on error. .TP .L PROC_DAEMON Standard daemon setup is done for the child process. diff --git a/src/lib/libast/string/strtoi.h b/src/lib/libast/string/strtoi.h index b1155a5da..91799c6f6 100644 --- a/src/lib/libast/string/strtoi.h +++ b/src/lib/libast/string/strtoi.h @@ -50,7 +50,7 @@ * a default base of 1 will determine the base from the input using bb#* * a base prefix in the string overrides *b * *b will not be set if the string has no base prefix - * if m>1 and no multipler was specified then the result is multiplied by m + * if m>1 and no multiplier was specified then the result is multiplied by m * if m<0 then multipliers are not consumed * if a base arg or prefix is specified then multiplier is not consumed * diff --git a/src/lib/libcmd/cut.c b/src/lib/libcmd/cut.c index 89d24c191..732d4309a 100644 --- a/src/lib/libcmd/cut.c +++ b/src/lib/libcmd/cut.c @@ -59,7 +59,7 @@ USAGE_LICENSE "option.]" "[s:suppress|only-delimited?Suppress lines with no delimiter characters, " "when used with the \b-f\b option. By default, lines with no " - "delimiters will be passsed in untouched.]" + "delimiters will be passed in untouched.]" "[D:line-delimeter|output-delimiter]:[ldelim?The line delimiter character for " "the \b-f\b option is set to \aldelim\a. The default is the " "\bnewline\b character.]"