From fb93c5e22563750fbfda0b410192840ae3de70f0 Mon Sep 17 00:00:00 2001 From: tg Date: Sun, 17 Apr 2011 15:40:35 +0000 Subject: [PATCH] =?UTF-8?q?by=20prodding=20of=20wbx@=20let=20functions=20i?= =?UTF-8?q?nherit=20a=20global=20xtrace=20(also=20since=20all=20other=20sh?= =?UTF-8?q?ells=20seem=20to=20do=20it,=20save=20posh=20which=20doesn?= =?UTF-8?q?=E2=80=99t=20trace=E2=80=BD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 1660055..91901e9 100644 --- a/exec.c +++ b/exec.c @@ -22,7 +22,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.89 2011/04/02 10:30:10 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.90 2011/04/17 15:40:35 tg Exp $"); #ifndef MKSH_DEFAULT_EXECSHELL #define MKSH_DEFAULT_EXECSHELL "/bin/sh" @@ -717,7 +717,7 @@ comexec(struct op *t, struct tbl * volatile tp, const char **ap, } old_xflag = Flag(FXTRACE); - Flag(FXTRACE) = tp->flag & TRACE ? 1 : 0; + Flag(FXTRACE) |= tp->flag & TRACE ? 1 : 0; old_inuse = tp->flag & FINUSE; tp->flag |= FINUSE;