svn commit: r217473 - head/bin/sh

[Jilles Tjoelker]

Author: jilles
Date: Sun Jan 16 14:11:50 2011
New Revision: 217473
URL: http://svn.freebsd.org/changeset/base/217473

Log:
  sh(1): Document changes to 'exit' from traps.

Modified:
  head/bin/sh/sh.1

Modified: head/bin/sh/sh.1
==============================================================================
--- head/bin/sh/sh.1	Sun Jan 16 13:56:41 2011	(r217472)
+++ head/bin/sh/sh.1	Sun Jan 16 14:11:50 2011	(r217473)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd December 21, 2010
+.Dd January 16, 2011
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1848,7 +1848,12 @@ If
 .Ar exitstatus
 is given
 it is used as the exit status of the shell;
-otherwise the exit status of the preceding command is used.
+otherwise, if the shell is executing an
+.Cm EXIT
+trap, the exit status of the last command before the trap is used;
+if the shell is executing a trap for a signal,
+the shell exits by resending the signal to itself;
+otherwise, the exit status of the preceding command is used.
 The exit status should be an integer between 0 and 255.
 .It Ic export Ar name ...
 .It Ic export Op Fl p