summaryrefslogtreecommitdiffstats
path: root/bin/sh/sh.1
diff options
context:
space:
mode:
authorcracauer <cracauer@FreeBSD.org>1999-04-01 13:27:36 +0000
committercracauer <cracauer@FreeBSD.org>1999-04-01 13:27:36 +0000
commit5610584759a8f26e412dab049cd02e3a33a2d256 (patch)
tree8e1d1ff2895d740ebfae1a16cedd73afd5ed5078 /bin/sh/sh.1
parentfa9cc0ebfb3821fac3240755fae227fa654a37f7 (diff)
downloadFreeBSD-src-5610584759a8f26e412dab049cd02e3a33a2d256.zip
FreeBSD-src-5610584759a8f26e412dab049cd02e3a33a2d256.tar.gz
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.
Diffstat (limited to 'bin/sh/sh.1')
-rw-r--r--bin/sh/sh.114
1 files changed, 13 insertions, 1 deletions
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 61b8aff..d55b9df 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
OpenPOWER on IntegriCloud