Displaying 2 results from an estimated 2 matches for "578d8919".
Did you mean:
578819
2020 Mar 28
0
[klibc:update-dash] dash: [ERROR] Set exitstatus in onint
...sr/dash/error.c
index 9d31989e..f9ea9198 100644
--- a/usr/dash/error.c
+++ b/usr/dash/error.c
@@ -105,6 +105,7 @@ onint(void) {
signal(SIGINT, SIG_DFL);
raise(SIGINT);
}
+ exitstatus = SIGINT + 128;
exraise(EXINT);
/* NOTREACHED */
}
diff --git a/usr/dash/eval.c b/usr/dash/eval.c
index 578d8919..b3e971bf 100644
--- a/usr/dash/eval.c
+++ b/usr/dash/eval.c
@@ -853,21 +853,15 @@ bail:
listsetvar(varlist.list, VEXPORT);
}
if (evalbltin(cmdentry.u.cmd, argc, argv, flags)) {
- int status;
- int i;
-
- i = exception;
- if (i == EXEXIT)
- goto raise;
-
- status = (i == EXI...
2020 Mar 28
0
[klibc:update-dash] dash: [TRAP] Make sure evalskip is zero before running traps
...ff-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/eval.c | 6 ++++--
usr/dash/trap.c | 11 +++++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/usr/dash/eval.c b/usr/dash/eval.c
index adf05fde..578d8919 100644
--- a/usr/dash/eval.c
+++ b/usr/dash/eval.c
@@ -197,6 +197,9 @@ evaltree(union node *n, int flags)
TRACE(("evaltree(NULL) called\n"));
goto out;
}
+
+ dotrap();
+
#ifndef SMALL
displayhist = 1; /* show history substitutions done with fc */
#endif
@@ -308,8 +311,7 @@ out...