From 13f12bb1515bba7e136f815e45e8748acee9e3db Mon Sep 17 00:00:00 2001
From: Jared Yanovich <jaredy@cvs.openbsd.org>
Date: Thu, 29 Jan 2009 23:27:27 +0000
Subject: pass "xerrok" status across the execution call stack to more closely
 match what both POSIX and ksh.1 already describe in regards to set
 -e/errexit's behavior in determining when to exit from nonzero return values.

specifically, the truth values tested as operands to `&&' and `||', as
well as the resulting compound expression itself, along with the truth
value resulting from a negated command (i.e. a pipeline prefixed `!'),
should not make the shell exit when -e is in effect.

issue reported by matthieu.
testing matthieu, naddy.
ok miod (earlier version), otto.
man page ok jmc.
---
 bin/ksh/ksh.1 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin/ksh/ksh.1')

diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index c979fbe5fa8..a25235e9e19 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: ksh.1,v 1.122 2008/05/17 23:31:52 sobrado Exp $
+.\"	$OpenBSD: ksh.1,v 1.123 2009/01/29 23:27:26 jaredy Exp $
 .\"
 .\"	Public Domain
 .\"
-.Dd $Mdocdate: May 17 2008 $
+.Dd $Mdocdate: January 29 2009 $
 .Dt KSH 1
 .Os
 .Sh NAME
@@ -3567,8 +3567,9 @@ explicitly tested by a shell construct such as
 .Ic until ,
 .Ic while ,
 .Ic && ,
+.Ic || ,
 or
-.Ic ||
+.Ic !\&
 statements.
 .It Fl f \*(Ba Ic noglob
 Do not expand file name patterns.
-- 
cgit v1.2.3