manual merge from readonly-korg-master

Change-Id: Id4a09fa11fee4262d9b945369b595644cca6d330
This commit is contained in:
Jean-Baptiste Queru 2010-09-10 10:43:40 -07:00
commit 1d10577e9b
3 changed files with 5 additions and 6 deletions

View File

@ -15,5 +15,8 @@ The manual page can be downloaded as PDF (ISO A4 paper) from
https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh.pdf or read
online at https://www.mirbsd.org/man1/mksh (HTML).
There are currently no changes to the code in this
subdirectory.
The following changes are done to code in this subdirectory
at the moment:
• check.t main.sh: remove the 'stop' alias to 'kill -STOP'
since Android has a built in stop command that the alias
overrides, causing problems with testing tools

View File

@ -5351,7 +5351,6 @@ expected-stdout:
nohup='nohup '
r='fc -e -'
source='PATH=$PATH:. command .'
stop='kill -STOP'
suspend='kill -STOP $$'
type='whence -v'
---
@ -5421,7 +5420,6 @@ expected-stdout:
nohup='nohup '
r='fc -e -'
source='PATH=$PATH:. command .'
stop='kill -STOP'
suspend='kill -STOP $$'
type='whence -v'
---
@ -5446,7 +5444,6 @@ expected-stdout:
nohup='nohup '
r='fc -e -'
source='PATH=$PATH:. command .'
stop='kill -STOP'
suspend='kill -STOP $$'
type='whence -v'
---

View File

@ -74,7 +74,6 @@ static const char *initcoms[] = {
"hash=alias -t", /* not "alias -t --": hash -r needs to work */
"type=whence -v",
#ifndef MKSH_UNEMPLOYED
"stop=kill -STOP",
"suspend=kill -STOP $$",
#endif
"autoload=typeset -fu",