JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

the new pdksh maintainer's patch is bogus

Browse Source 
he didn't even run the testsuite

now, in not-rv_pass mode, traps are still executed
XXX look where this could break
This commit is contained in:
tg
2005-05-25 14:07:29 +00:00
parent d73fd20cb9
commit 84dcd241c1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
exec.c
View File

@@ -1,11 +1,11 @@
/** $MirOS: src/bin/mksh/exec.c,v 1.4 2005/05/25 13:45:59 tg Exp $ */ /** $MirOS: src/bin/mksh/exec.c,v 1.5 2005/05/25 14:07:29 tg Exp $ */
/* $OpenBSD: exec.c,v 1.41 2005/03/30 17:16:37 deraadt Exp $ */ /* $OpenBSD: exec.c,v 1.41 2005/03/30 17:16:37 deraadt Exp $ */
#include "sh.h" #include "sh.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <ctype.h> #include <ctype.h>
__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.4 2005/05/25 13:45:59 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/exec.c,v 1.5 2005/05/25 14:07:29 tg Exp $");
static int comexec(struct op *, struct tbl *volatile, char **, static int comexec(struct op *, struct tbl *volatile, char **,
int volatile); int volatile);
@@ -368,8 +368,8 @@ execute(struct op *volatile t,
quitenv(NULL); /* restores IO */ quitenv(NULL); /* restores IO */
if ((flags&XEXEC)) if ((flags&XEXEC))
unwind(LEXIT); /* exit child */ unwind(LEXIT); /* exit child */
if (rv != 0 && !rv_prop && !(flags & XERROK)) { if (rv != 0 && !(flags & XERROK)) {
if (Flag(FERREXIT)) if (Flag(FERREXIT) && !rv_prop)
unwind(LERROR); unwind(LERROR);
trapsig(SIGERR_); trapsig(SIGERR_);
} }