acinclude.m4 command/eval.sh lib/set-d-vars.sh @@ -42,6 +42,12 @@ else done fi +# Get the fully expanded name of pkgdatadir. This is used in kshdb.in +# and dbg-main.sh.in and for installing debugger files. + +pkgdatadir=$datadir/zshdb +AC_SUBST_DIR(PKGDATADIR, $pkgdatadir) + AM_MISSING_PROG(GIT2CL, git2cl, $missing_dir) AC_PROG_LN_S AC_PATH_PROG(RM, rm, true) configure.ac @@ -6,7 +6,39 @@ if [[ -z "$.sh.level}" ]] ; then exit 2 fi -_Dbg_libdir='.' +# This routine gets called via the -c or --command option and its sole +# purpose is to capture the command string such as via "x $*" or +# in a traceback ("where"). +function bashdb_eval { + eval $* # Type: "x $*" to see what's being run. +} + +typeset -a _Dbg_script_args=("$@") + +# Equivalent to basename $0; the short program name +typeset _Dbg_pname=${0##*/} + +typeset prefix=@prefix@ +typeset _Dbg_libdir=@PKGDATADIR@ + +# Parse just the libdir option +typeset -i i +for ((i=0; $i<${#_Dbg_script_args[@]}-1; i++)) ; do + typeset arg=${_Dbg_script_args[$i]} + if [[ $arg == '-L' || $arg == '--libdir' ]] ; then + ((i++)) + _Dbg_libdir="${_Dbg_script_args[$i]}" + break + fi +done +if [[ ! -d $_Dbg_libdir ]] && [[ ! -d $_Dbg_libdir ]] ; then + echo "${_Dbg_pname}: Can't read debugger library directory '${_Dbg_libdir}'." + echo "${_Dbg_pname}: Perhaps kshdb is installed wrong (if its installed)." >&2 + echo "${_Dbg_pname}: Try running kshdb using -L (with a different directory)." >&2 + echo "${_Dbg_pname}: Run kshdb --help for a list and explanation of options." >&2 + exit 1 +fi + . ${_Dbg_libdir}/dbg-main.sh # Note that this is called via kshdb rather than "ksh --debugger" or kshdb-trace kshdb.in @@ -118,12 +118,12 @@ if [[ $0 == *columnize.sh ]] ; then unset columnized typeset columns typeset columnized - if [[ -n $KSH_VERSION ]] ; then - columnize columns "$@" - columized=columns - else +# if [[ -n $KSH_VERSION ]] ; then +# columnize columns "$@" +# columized=columns +# else columnize "$@" - fi +# fi typeset -i i echo '===============' for ((i=0; i<${#columnized[@]}; i++)) ; do lib/columnize.sh @@ -136,11 +136,11 @@ _Dbg_onecmd() { _Dbg_last_cmd='down' ;; -# # evaluate as bash command -# e | ev | eva | eval ) -# _Dbg_do_eval $@ -# _Dbg_last_cmd='eval' -# ;; + # evaluate as bash command + e | ev | eva | eval ) + _Dbg_do_eval $@ + _Dbg_last_cmd='eval' + ;; # Set stack frame fr | fra | fra | frame ) @@ -152,11 +152,11 @@ _Dbg_onecmd() { help ) _Dbg_do_help $args ;; -# # print globbed or substituted variables -# p | pr | pri | prin | print ) -# _Dbg_do_print "$args" -# _Dbg_last_cmd='print' -# ;; + # print globbed or substituted variables + p | pr | pri | prin | print ) + _Dbg_do_print "$args" + _Dbg_last_cmd='print' + ;; # quit quit ) lib/processor.sh f4cf1c47d2a5bdb2510ad2829f680c8caed6ab77 R. Bernstein rocky@gnu.org http://github.com/rocky/kshdb/commit/ed02a5f17b09aa1e603cd283b34b092b94ac6b71 ed02a5f17b09aa1e603cd283b34b092b94ac6b71 2008-08-14T08:28:25-07:00 2008-08-14T08:28:25-07:00 Add print and eval. Parse -L and --library in kshdb. 2c9df061fd5259aeb13c2239ca04e80128d3757f R. Bernstein rocky@gnu.org