Trap debugged-program exit

Author: rocky

command/quit.sh

@@ -74,6 +74,11 @@ _Dbg_do_quit() {
 	# Get the last command into the history
 	# set -o incappendhistory
 	print -s -- $_Dbg_orig_cmd >/dev/null
+	if (($_Dbg_in_exit_handler != 0)); then
+	    _Dbg_exit_from_exit_handler=1
+	    return 1
+	fi
+
         _Dbg_cleanup
     fi
 

command/run.sh

@@ -1,7 +1,7 @@
 # -*- shell-script -*-
 # run command.
 #
-#   Copyright (C) 2008-2010, 2016 Rocky Bernstein [email protected]
+#   Copyright (C) 2008-2010, 2016, 2023 Rocky Bernstein [email protected]
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -80,7 +80,9 @@ _Dbg_do_run() {
 
   builtin cd $_Dbg_init_cwd
 
-  _Dbg_cleanup
+  if (( $_Dbg_in_exit_handler != 0)); then
+      _Dbg_cleanup
+  fi
   eval "exec $exec_cmd"
 }
 

lib/sig.sh

@@ -2,7 +2,7 @@
 #  Signal handling routines
 #
 #   Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2010,
-#   2011 Rocky Bernstein <[email protected]>
+#   2011, 2023 Rocky Bernstein <[email protected]>
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -32,6 +32,11 @@ typeset -i _Dbg_QUIT_ON_QUIT=0
 # Return code that debugged program reports
 typeset -i _Dbg_program_exit_code=0
 
+# 1 if we we running post-mortem in exit handler?
+typeset -i _Dbg_in_exit_handler=0
+# Allow Quit and things like that to signal a final quit.
+typeset -i _Dbg_exit_from_exit_handler=0
+
 ############################################################
 ## Signal arrays: These are indexed by the signal number. ##
 ############################################################
@@ -109,39 +114,15 @@ _Dbg_subst_handler_var() {
 # command loop
 _Dbg_exit_handler() {
 
-  # Consider putting the following line(s) in a routine.
-  # Ditto for the restore environment
   typeset -i _Dbg_debugged_exit_code=$?
 
   # Turn off line and variable trace listing; allow unset parameter expansion.
   set +x +v +u
 
-  if [[ ${_Dbg_sig_print[0]} == "print" ]] ; then
-    # Note: use the same message that gdb does for this.
-    _Dbg_msg "Program received signal EXIT (0)..."
-    if [[ ${_Dbg_sig_show_stack[0]} == "showstack" ]] ; then
-      _Dbg_do_backtrace 0
-    fi
-  fi
-
   if [[ $_Dbg_old_EXIT_handler != '' ]] ; then
     eval $_Dbg_old_EXIT_handler
   fi
 
-  # If we've set the QUIT signal handler not to stop, or we've in the
-  # middle of leaving so many (subshell) levels or we have set to
-  # leave quietly on termination, then do it!
-
-  if [[ ${_Dbg_sig_stop[0]} != "stop" ]] \
-    || (( _Dbg_QUIT_LEVELS != 0 )) \
-    || (( _Dbg_QUIT_ON_QUIT )) ; then
-    _Dbg_do_quit
-    # We don't return from here.
-  fi
-
-  # We've tested for all the quitting conditions above.
-  # Even though this is an exit handler, don't exit!
-
   typeset term_msg="normally"
   if [[ $_Dbg_debugged_exit_code != 0 ]] ; then
     term_msg="with code $_Dbg_debugged_exit_code"
@@ -154,10 +135,16 @@ _Dbg_exit_handler() {
       "Debugged program terminated $term_msg. Use q to quit or R to restart."
 
     _Dbg_running=0
+    _Dbg_exit_from_exit_handler=0
+    _Dbg_in_exit_handler=1
     while : ; do
-      _Dbg_process_commands
+	_Dbg_process_commands
+	if (($_Dbg_exit_from_exit_handler != 0)); then
+	    break
+	fi
     done
   fi
+  return $((128+$_Dbg_debugged_exit_code))
 }
 
 # Generic signal handler. We consult global array _Dbg_sig_* for how
@@ -280,3 +267,7 @@ _Dbg_init_default_traps() {
     _Dbg_init_trap TERM   "print" "showstack" "stop"
     # _Dbg_init_trap TRAP   "print" "showstack" "stop"
 }
+
+
+set  -o localtraps
+trap '_Dbg_exit_handler' EXIT

test/data/Makefile.am

@@ -35,6 +35,7 @@ check_DATA = \
 	export.cmd         \
 	frame.cmd          \
 	frame.right        \
+	frame-5.8.1.right  \
 	list.cmd           \
 	list.right         \
 	multi1.cmd         \

test/data/action.right

@@ -1,7 +1,7 @@
 (dbg-test1.sh:4):
 fn1 () { echo "fn1 here" x=5 fn3 }
 +set basename on
-Show short filenames (the basename) is on.
+Show short filenames (the basename) is  on.
 +# Debugger test of action command, and some $ vars
 +# 
 +# Show actions
@@ -38,3 +38,6 @@ dollar 0 is dbg-test1.sh
 $? is 0
 +quit 
 zshdb: That's all, folks...
+Debugged program terminated normally. Use q to quit or R to restart.
+
+zshdb: That's all, folks...

test/data/brkpt1.right

@@ -65,3 +65,6 @@ Num Type       Disp Enb What
 +# L
 +quit 
 zshdb: That's all, folks...
+Debugged program terminated normally. Use q to quit or R to restart.
+
+zshdb: That's all, folks...

test/data/bug-args.right

@@ -42,3 +42,6 @@ Dollar 0 from eval is now foo
 $? is 0
 +quit 
 zshdb: That's all, folks...
+Debugged program terminated normally. Use q to quit or R to restart.
+
+zshdb: That's all, folks...

test/data/bug-delete.right

@@ -28,3 +28,6 @@ echo line 7
 +# Should have stopped at line 7 above
 +quit 
 zshdb: That's all, folks...
+Debugged program terminated normally. Use q to quit or R to restart.
+
+zshdb: That's all, folks...

test/data/bug-errexit.right

@@ -12,3 +12,6 @@ print one
 ->0 in file `bug-errexit.sh' at line 6
 +quit 
 zshdb: That's all, folks...
+Debugged program terminated normally. Use q to quit or R to restart.
+
+zshdb: That's all, folks...

test/data/bug-ksharrays.right

@@ -20,3 +20,6 @@ shwordsplit
 $? is 0
 +quit 
 zshdb: That's all, folks...
+Debugged program terminated normally. Use q to quit or R to restart.
+
+zshdb: That's all, folks...