d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a problem with sh that conflicts with the -e

Browse Source 
flag text in the man page.  Now this will work
correctly:

	/bin/sh -ec 'false && true; echo hi'

Obtained from: VaX#n8 <vax@linkdead.paranoia.com>
This commit is contained in:
Steve Price 1996-10-06 15:17:19 +00:00
parent ae58bac757
commit d1e9927277
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=18754
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/sh/eval.c
View File

@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: eval.c,v 1.4 1995/09/20 08:30:56 davidg Exp $
* $Id: eval.c,v 1.5 1996/09/01 10:19:57 peter Exp $
*/
#ifndef lint
@ -209,8 +209,11 @@ evaltree(n, flags)
break;
case NAND:
evaltree(n->nbinary.ch1, EV_TESTED);
if (evalskip || exitstatus != 0)
if (evalskip || exitstatus != 0) {
/* don't bomb out on "set -e; false && true" */
flags |= EV_TESTED;
goto out;
}
evaltree(n->nbinary.ch2, flags);
break;
case NOR: