Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix another problem with "set -e": "! true" should terminate the shell.

This commit is contained in:
tron 2008-05-24 19:06:43 +00:00
parent 45c4cacf02
commit c2987416cd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/sh/eval.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: eval.c,v 1.90 2008/05/24 17:12:53 tron Exp $ */
/* $NetBSD: eval.c,v 1.91 2008/05/24 19:06:43 tron Exp $ */
/*-
* Copyright (c) 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
__RCSID("$NetBSD: eval.c,v 1.90 2008/05/24 17:12:53 tron Exp $");
__RCSID("$NetBSD: eval.c,v 1.91 2008/05/24 19:06:43 tron Exp $");
#endif
#endif /* not lint */
@ -232,6 +232,7 @@ evaltree(union node *n, int flags)
getpid(), n, n->type, flags));
switch (n->type) {
case NSEMI:
do_etest = !(flags & EV_TESTED);
evaltree(n->nbinary.ch1, flags & EV_TESTED);
if (evalskip)
goto out;
@ -291,6 +292,7 @@ evaltree(union node *n, int flags)
case NNOT:
evaltree(n->nnot.com, EV_TESTED);
exitstatus = !exitstatus;
do_etest = !(flags & EV_TESTED);
break;
case NPIPE:
evalpipe(n);