Changes for debug input/output (hacked)

Author: ext-michal.rogalinski

command/eval.sh

@@ -110,7 +110,7 @@ _Dbg_do_eval() {
     typeset -i _Dbg_rc
     if [[ -t $_Dbg_fdi  ]] ; then
         _Dbg_set_dol_q $_Dbg_debugged_exit_code
-        . $_Dbg_evalfile >&${_Dbg_fdi}
+        . $_Dbg_evalfile >>"$_Dbg_tty"
     else
         _Dbg_set_dol_q $_Dbg_debugged_exit_code
         . $_Dbg_evalfile

command/handle.sh

@@ -36,6 +36,21 @@
 # stack is printed. Prefacing these actions with \"no\" indicates not to
 # do the indicated action."
 
+_Dbg_help_add handle \
+"**handle** *signal* *action*
+
+Specify how to handle *signal*.
+
+*signal* is a signal name like SIGSEGV, but numeric signals like 11
+(which is usually equivalent on \*nix systems) is okay too.
+
+*action* is one of \"stop\", \"nostop\", \"print\", and
+\"noprint\". \"Stop\" indicates entering debugger if this signal
+happens. \"Print\" indicates printing a message if this signal is
+encountered. \"Stack\" is like \"print\" but except the entire call
+stack is printed. Prefacing these actions with \"no\" indicates not to
+do the indicated action."
+
 _Dbg_do_handle() {
     typeset sig=$1
     typeset cmd=$2

dbg-pre.sh

@@ -12,7 +12,7 @@
 #   WARRANTY; without even the implied warranty of MERCHANTABILITY or
 #   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 #   for more details.
-#   
+#
 #   You should have received a copy of the GNU General Public License along
 #   with zshdb; see the file COPYING.  If not, write to the Free Software
 #   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA.
@@ -44,7 +44,7 @@ typeset -i _Dbg_script=0
 # This function is overwritten by when lib/fns.sh gets loaded
 _Dbg_msg()
 {
-  echo $*
+  echo "$*"
 }
 
 # Used by "show version" as well as --version
@@ -56,9 +56,9 @@ _Dbg_do_show_version()
 # Expand filename given as $1.
 # we echo the expanded name or return $1 unchanged if a bad filename.
 # Return is 0 if good or 1 if bad.
-# File globbing is handled. 
-# Note we don't check that the file exists, just that the format is 
-# valid; we do check that we can "search" the directory implied in the 
+# File globbing is handled.
+# Note we don't check that the file exists, just that the format is
+# valid; we do check that we can "search" the directory implied in the
 # filename.
 
 function _Dbg_expand_filename {
@@ -115,15 +115,14 @@ typeset -x _Dbg_init_cwd=$PWD
 
 typeset -i _Dbg_running=1      # True we are not finished running the program
 
-typeset -i _Dbg_brkpt_num=0    # If nonzero, the breakpoint number that we 
+typeset -i _Dbg_brkpt_num=0    # If nonzero, the breakpoint number that we
                                # are currently stopped at.
 
 # Sets whether or not to display command before executing it.
 typeset _Dbg_set_trace_commands='off'
 
 # Known normal IFS consisting of a space, tab and newline
-typeset -x _Dbg_space_IFS=' 	
-'
+typeset -x _Dbg_space_IFS=$' \t\r\n'
 
 # Number of statements to run before entering the debugger.  Is used
 # intially to get out of sourced dbg-main.inc script and in top-level

lib/msg.sh

@@ -41,7 +41,7 @@ _Dbg_confirm() {
 	  if [[ -t $_Dbg_fdi ]]; then
 	      vared -e -h -p "$_Dbg_confirm_prompt" _Dbg_response <&${_Dbg_fdi} || break
 	  else
-	      read "?$_Dbg_confirm_prompt" _Dbg_response <&${_Dbg_fdi} || break
+	      read "?$_Dbg_confirm_prompt" _Dbg_response <&${_Dbg_fdi} >>$_Dbg_prompt_output || break
 	  fi
 
 	case "$_Dbg_response" in
@@ -86,17 +86,19 @@ function _Dbg_errmsg_no_cr {
 }
 
 function _Dbg_msg {
-    if [[ -n $_Dbg_fdi ]] && [[ -t $_Dbg_fdi ]] ; then
-	builtin print -- "$@"  >&${_Dbg_fdi}
+    #if [[ -n "$_Dbg_tty" ]] && [[ -t "$_Dbg_tty" ]] ; then
+	if [[ -n "$_Dbg_tty" ]] ; then
+	builtin print -- "$@"  >> "$_Dbg_tty"
     else
 	builtin print -- "$@"
     fi
 
 }
 
 function _Dbg_msg_nocr {
-    if [[ -n $_Dbg_fdi ]] && [[ -t $_Dbg_fdi ]] ; then
-	builtin echo -n "$@" >&${_Dbg_fdi}
+    #if [[ -n "$_Dbg_tty" ]] && [[ -t "$_Dbg_tty" ]] ; then
+	if [[ -n "$_Dbg_tty" ]] ; then
+	builtin echo -n "$@" >>"$_Dbg_tty"
     else
 	builtin echo -n "$@"
     fi
@@ -117,8 +119,9 @@ function _Dbg_printf_nocr {
 	builtin printf "$format" "$@" >>$_Dbg_logfid
     fi
     if (( ! _Dbg_logging_redirect )) ; then
-	if [[ -n $_Dbg_fdi ]] && [[ -t $_Dbg_fdi ]] ; then
-	    builtin printf "$format" "$@" >&${_Dbg_fdi}
+	#if [[ -n $_Dbg_fdi ]] && [[ -t $_Dbg_fdi ]] ; then
+	if [[ -n "$_Dbg_tty" ]] ; then
+	    builtin printf "$format" "$@" >>"$_Dbg_tty"
 	else
 	    builtin printf "$format" "$@"
 	fi

lib/processor.sh

@@ -84,6 +84,7 @@ function _Dbg_process_commands {
       ${hook}
   done
 
+  _Dbg_prompt_output="${_Dbg_tty:-/dev/null}"
 
   # Loop over all pending open input file descriptors
   while (( ${#_Dbg_fd[@]} > 0 )) ; do
@@ -124,21 +125,21 @@ function _Dbg_process_commands {
 	  ((_Dbg_cmd_num++))
 	  if ((0 == _Dbg_in_vared)) && [[ -t $_Dbg_fdi ]]; then
 	      _Dbg_in_vared=1
-	      vared -e -h -p "$_Dbg_prompt" line <&${_Dbg_fdi} || break
+	      vared -e -h -p "$_Dbg_prompt" line 2>>$_Dbg_prompt_output <&${_Dbg_fdi} || break
 	      _Dbg_in_vared=0
 	  else
 	      if ((1 == _Dbg_in_vared)) ; then
-		  _Dbg_msg "Unable to echo characters in input below"
+		   _Dbg_msg "Unable to echo characters in input below"
 	      fi
 	      if [[ -z ${_Dbg_cmdfile[-1]} ]] ; then
-		  read -u ${_Dbg_fdi} "?$_Dbg_prompt" line || break
+		   read -u ${_Dbg_fdi} "?$_Dbg_prompt" line 2>>$_Dbg_prompt_output || break
 	      else
-		  read -u ${_Dbg_fdi}  line || break
+		   read -u ${_Dbg_fdi}  line || break
 	      fi
 	  fi
-          _Dbg_onecmd "$line"
-          rc=$?
-          _Dbg_postcmd
+      _Dbg_onecmd "$line"
+      rc=$?
+      _Dbg_postcmd
 	  ((_Dbg_continue_rc >= 0)) && return $_Dbg_continue_rc
 
 	  # Add $line to the debugger history file unless there was an
@@ -156,7 +157,7 @@ function _Dbg_process_commands {
 	      fi
 	  fi
 
-          (( rc > 0 )) && return $rc
+      (( rc > 0 )) && return $rc
 
 	  line=''
       done # read "?$_Dbg_prompt" ...
@@ -207,8 +208,8 @@ _Dbg_onecmd() {
     fi
 
     if [[ -n ${_Dbg_debugger_commands[$expanded_alias]} ]] ; then
-	${_Dbg_debugger_commands[$expanded_alias]} $args
-	return $?
+      ${_Dbg_debugger_commands[$expanded_alias]} $args
+      return $?
     fi
 
     # The below are command names that are just a little irregular
@@ -254,7 +255,7 @@ _Dbg_onecmd() {
 	* )
 	   if (( _Dbg_set_autoeval )) ; then
 	       if [[ -t $_Dbg_fdi ]] ; then
-		   if ! _Dbg_do_eval $_Dbg_cmd $args >&${_Dbg_fdi} 2>&1 ; then
+		   if ! _Dbg_do_eval $_Dbg_cmd $args >>"$_Dbg_tty" 2>&1 ; then
 		       return -1
 		   fi
 	       else

lib/tty.sh

@@ -30,11 +30,11 @@
 function _Dbg_open_if_tty {
     _Dbg_new_fd=-1
     (( $# != 1 )) && return 1
-    [[ ! -r $1 ]] || [[ ! -w $1 ]] && return 1
+    [[ ! -w $1 ]] && return 1
     typeset -i r=1
     # Code modelled off of code from David Korn:
     {
-	if exec {_Dbg_new_fd} <> $1 ; then
+	if exec ${_Dbg_new_fd} > $1 ; then
 	    if [[ -t $_Dbg_new_fd  ]] ; then
 		r=0
 	    else