Displaying 2 results from an estimated 2 matches for "09a5cbf1".
2020 Mar 28
0
[klibc:update-dash] dash: eval: make traps work when "set -e" is enabled
...o Ospite <ao2 at ao2.it>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/eval.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr/dash/eval.c b/usr/dash/eval.c
index 01bc5234..09a5cbf1 100644
--- a/usr/dash/eval.c
+++ b/usr/dash/eval.c
@@ -307,11 +307,11 @@ setstatus:
break;
}
out:
+ dotrap();
+
if (checkexit & status)
goto exexit;
- dotrap();
-
if (flags & EV_EXIT) {
exexit:
exraise(EXEXIT);
2020 Mar 28
0
[klibc:update-dash] dash: eval: Silence compiler warning about missing parentheses
...off-by: Antonio Ospite <ao2 at ao2.it>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/eval.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr/dash/eval.c b/usr/dash/eval.c
index 09a5cbf1..dc0c9fa2 100644
--- a/usr/dash/eval.c
+++ b/usr/dash/eval.c
@@ -279,7 +279,7 @@ checkexit:
isor = n->type - NAND;
status = evaltree(n->nbinary.ch1,
(flags | ((isor >> 1) - 1)) & EV_TESTED);
- if (!status == isor || evalskip)
+ if ((!status) == isor || evalskip)
b...