in an interesting piece of self humour, remove the stop and suspend

aliases from shells requiring the Arbeitsamt to get a job ;-)
This commit is contained in:
tg 2009-07-25 20:52:41 +00:00
parent ac148debe8
commit cfe6688a36
3 changed files with 73 additions and 5 deletions

View File

@ -1,5 +1,5 @@
#!/bin/sh
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.410 2009/07/25 20:18:13 tg Exp $'
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.411 2009/07/25 20:52:39 tg Exp $'
#-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Thorsten Glaser <tg@mirbsd.org>
@ -915,6 +915,9 @@ fi
ac_ifcpp 'ifdef MKSH_BINSHREDUCED' isset_MKSH_BINSHREDUCED '' \
"if a reduced-feature sh is requested" && \
check_categories=$check_categories,binsh
ac_ifcpp 'ifdef MKSH_UNEMPLOYED' isset_MKSH_UNEMPLOYED '' \
"if mksh will be built without job control" && \
check_categories=$check_categories,arge
ac_ifcpp 'ifdef MKSH_ASSUME_UTF8' isset_MKSH_ASSUME_UTF8 '' \
'if the default UTF-8 mode is specified' && : ${HAVE_SETLOCALE_CTYPE=0}
ac_ifcpp 'ifdef MKSH_CONSERVATIVE_FDS' isset_MKSH_CONSERVATIVE_FDS '' \

68
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.293 2009/07/19 11:14:28 tg Exp $
# $MirOS: src/bin/mksh/check.t,v 1.294 2009/07/25 20:52:40 tg Exp $
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@ -4716,6 +4716,7 @@ expected-stderr-pattern:
name: aliases-1
description:
Check if built-in shell aliases are okay
category: !arge
stdin:
alias
typeset -f
@ -4734,6 +4735,26 @@ expected-stdout:
suspend='kill -STOP $$'
type='whence -v'
---
name: aliases-1-hartz4
description:
Check if built-in shell aliases are okay
category: arge
stdin:
alias
typeset -f
expected-stdout:
autoload='typeset -fu'
functions='typeset -f'
hash='alias -t'
history='fc -l'
integer='typeset -i'
local=typeset
login='exec login'
nohup='nohup '
r='fc -e -'
source='PATH=$PATH:. command .'
type='whence -v'
---
name: aliases-2a
description:
Check if set -o posix disables built-in aliases (except a few)
@ -4762,6 +4783,7 @@ expected-stdout:
name: aliases-2b
description:
Check if set -o posix does not influence built-in aliases
category: !arge
arguments: !-o!posix!
stdin:
alias
@ -4784,6 +4806,7 @@ expected-stdout:
name: aliases-3b
description:
Check if running as sh does not influence built-in aliases
category: !arge
arguments: !-o!posix!
stdin:
cp "$__progname" sh
@ -4804,6 +4827,49 @@ expected-stdout:
suspend='kill -STOP $$'
type='whence -v'
---
name: aliases-2b-hartz4
description:
Check if set -o posix does not influence built-in aliases
category: arge
arguments: !-o!posix!
stdin:
alias
typeset -f
expected-stdout:
autoload='typeset -fu'
functions='typeset -f'
hash='alias -t'
history='fc -l'
integer='typeset -i'
local=typeset
login='exec login'
nohup='nohup '
r='fc -e -'
source='PATH=$PATH:. command .'
type='whence -v'
---
name: aliases-3b-hartz4
description:
Check if running as sh does not influence built-in aliases
category: arge
arguments: !-o!posix!
stdin:
cp "$__progname" sh
./sh -c 'alias; typeset -f'
rm -f sh
expected-stdout:
autoload='typeset -fu'
functions='typeset -f'
hash='alias -t'
history='fc -l'
integer='typeset -i'
local=typeset
login='exec login'
nohup='nohup '
r='fc -e -'
source='PATH=$PATH:. command .'
type='whence -v'
---
name: aliases-funcdef-1
description:
Check if POSIX functions take precedences over aliases

5
main.c
View File

@ -33,7 +33,7 @@
#include <locale.h>
#endif
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.134 2009/07/25 20:26:32 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.135 2009/07/25 20:52:41 tg Exp $");
extern char **environ;
@ -60,8 +60,7 @@ static const char *initcoms[] = {
"alias",
"hash=alias -t", /* not "alias -t --": hash -r needs to work */
"type=whence -v",
#ifndef notyet_MKSH_UNEMPLOYED
/* the alias list must be constant, for the regression test suite */
#ifndef MKSH_UNEMPLOYED
"stop=kill -STOP",
"suspend=kill -STOP $$",
#endif