diff options
author | Martin Cracauer <cracauer@FreeBSD.org> | 1999-04-01 13:27:36 +0000 |
---|---|---|
committer | Martin Cracauer <cracauer@FreeBSD.org> | 1999-04-01 13:27:36 +0000 |
commit | c1c72a3c2a21f537b989350b1b06b8a44831987a (patch) | |
tree | 73e07332230c9dccde976955d509f7c32563b80e /bin/sh/sh.1 | |
parent | 29b873f38d2ab9345639df5d707f3df80f9fb5f2 (diff) | |
download | src-c1c72a3c2a21f537b989350b1b06b8a44831987a.tar.gz src-c1c72a3c2a21f537b989350b1b06b8a44831987a.zip |
The immediate execution of traps I introduced in September 1998 (to
make /etc/rc interruptible in cases when programs hang with blocked
signals) isn't standard enough.
It is now switched off by default and a new switch -T enables it.
You should update /etc/rc to the version I'm about to commit in a few
minutes to keep it interruptible.
Notes
Notes:
svn path=/head/; revision=45221
Diffstat (limited to 'bin/sh/sh.1')
-rw-r--r-- | bin/sh/sh.1 | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 61b8aff6ed5e..d55b9dfc2acb 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $Id: sh.1,v 1.23 1998/12/18 03:51:18 jkoshy Exp $ +.\" $Id: sh.1,v 1.24 1999/03/31 21:02:01 brian Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -202,12 +202,24 @@ after and ignores the contents of the .Ev ENV variable. + .It Fl s Li stdin Read commands from standard input (set automatically if no file arguments are present). This option has no effect when set after the shell has already started running (i.e. with .Xr set 1 Ns ). +.It Fl T Li asynctraps +When waiting for a child, execute traps immediately. If this option is +not set, traps are executed after the child exits, as specified in +.St -p1003.2 +This nonstandard option is useful to put guarding shells around childs +that block signals. The surrounding shell may kill the child or it may +just return control to the tty and leave the child alone, like this: +.Bd -literal -offset indent +sh -T -c "trap 'exit 1' 2 ; some-blocking-program" +.Ed +.Pp .It Fl u Li nounset Write a message to standard error when attempting to expand a variable that is not set, and if the |