From 2706eac45492b0fcdfc3cf104ac947e65d09ee25 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 7 Aug 2008 16:25:14 +0000 Subject: 25415: Make DEBUG_BEFORE_CMD the default. Reuse ERR_EXIT in DEBUG traps. Clean up trapreturn code. --- Src/builtin.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Src/builtin.c') diff --git a/Src/builtin.c b/Src/builtin.c index e1378d901..ee44b3776 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -4462,8 +4462,10 @@ bin_break(char *name, char **argv, UNUSED(Options ops), int func) retflag = 1; breaks = loops; lastval = num; - if (trapreturn == -2) - trapreturn = lastval; + if (trap_state == TRAP_STATE_PRIMED && trap_return == -2) { + trap_state = TRAP_STATE_FORCE_RETURN; + trap_return = lastval; + } return lastval; } zexit(num, 0); /* else treat return as logout/exit */ -- cgit 1.4.1