dbg-opts.sh getopt-test.sh @@ -8,7 +8,7 @@ pkgdata_DATA = \ # Set up the install target bin_SCRIPTS = kshdb -EXTRA_DIST = $(pkgdata_DATA) THANKS +EXTRA_DIST = $(pkgdata_DATA) THANKS getopt-test.sh # cvs2cl MAINTAINERCLEANFILES = ChangeLog Makefile.am @@ -1,4 +1,4 @@ -#!/bin/zsh +#!/bin/ksh autoreconf -i && \ autoconf && { print "Running configure with $@" autogen.sh @@ -4,6 +4,26 @@ AM_PATH_LISPDIR AM_MAINTAINER_MODE AM_INIT_AUTOMAKE([no-define]) +AC_SUBST(TRY_GETOPT) + +AC_ARG_ENABLE([gnugetopt], + AC_HELP_STRING([--enable-getopt], + [Allow GNU-style long options (default enabled)])) + +if test "${enable_getopt}" != "no" ; then + $SH_PROG ./getopt-test.sh + if test $? -eq 0 ; then + AC_MSG_RESULT([Good! Your long options seem to be working okay.]) + TRY_GETOPT=1 + else + AC_MSG_WARN([getopt doesn't seem to handle long options correctly.]) + AC_MSG_WARN([Disabling long-options in bashdb.]) + TRY_GETOPT=0 + fi +else + TRY_GETOPT=0 +fi + AC_CONFIG_SRCDIR(kshdb.in) if test x$srcdir = x ; then srcdir=$ac_pwd @@ -13,14 +33,14 @@ fi ## test which ksh to run. It can be omitted too in which case we'll ## look for a ksh binary. AC_ARG_WITH(ksh, AC_HELP_STRING([--with-ksh], - [location of ksh OK_KSH_VERS program]), KSH_PROG=$withval) + [location of ksh OK_KSH_VERS program]), SH_PROG=$withval) -if test "$KSH_PROG" = "yes" || test "$KSH_PROG" = "no" || test -z "$KSH_PROG" +if test "$SH_PROG" = "yes" || test "$SH_PROG" = "no" || test -z "$SH_PROG" then - AC_PATH_PROG(KSH_PROG, ksh93, no) + AC_PATH_PROG(SH_PROG, ksh93, no) fi -if test "$KSH_PROG" = no; then +if test "$SH_PROG" = no; then AC_MSG_ERROR([I didn't find the ksh executable.\ You might want to use the --with-ksh option.]) fi @@ -45,7 +65,7 @@ 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 +pkgdatadir=$datadir/kshdb AC_SUBST_DIR(PKGDATADIR, $pkgdatadir) AM_MISSING_PROG(GIT2CL, git2cl, $missing_dir) configure.ac @@ -38,5 +38,5 @@ done # # Run the user's debugger startup file # if [[ -z $KSHDB_RESTART_FILE && -r ~/.kshdbrc ]] ; then -# _Dbg_do_source ~/.zshbrc +# _Dbg_do_source ~/.kshbrc # fi dbg-main.sh @@ -1,5 +1,23 @@ -#!@KSH_PROG@ +#!@SH_PROG@ # -*- shell-script -*- +# kshdb - top-level debugger program. +# +# Copyright (C) 2008 Rocky Bernstein rocky@gnu.org +# +# kshdb is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any later +# version. +# +# kshdb is distributed in the hope that it will be useful, but WITHOUT ANY +# 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 kshdb; see the file COPYING. If not, write to the Free Software +# Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. + # Are we using a debugger-enabled ksh? If not let's stop right here. if [[ -z "$.sh.level}" ]] ; then echo "Sorry, your ksh just isn't modern enough." 2>&1 @@ -9,12 +27,15 @@ fi # 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 { +function _Dbg_eval { eval $* # Type: "x $*" to see what's being run. } typeset -a _Dbg_script_args=("$@") +# Original $0. Note we can't set this in an include. +typeset -r _Dbg_orig_0=$0 + # Equivalent to basename $0; the short program name typeset _Dbg_pname=${0##*/} @@ -39,6 +60,25 @@ if [[ ! -d $_Dbg_libdir ]] && [[ ! -d $_Dbg_libdir ]] ; then exit 1 fi +. $_Dbg_libdir/dbg-opts.sh + +# [[ $# == 0 && -z $show_version && -z $_Dbg_cmd ]] && { +# echo "${_Dbg_pname}: Need to give a script name to debug." +# exit 1 +# } + +if [[ ! -d $_Dbg_tmpdir ]] && [[ ! -w $_Dbg_tmpdir ]] ; then + echo "${_Dbg_pname}: cannot write to temp directory $_Dbg_tmpdir." >&2 + echo "${_Dbg_pname}: Use -T try directory location." >&2 + exit 1 +fi + +[[ -r $_Dbg_libdir/$_Dbg_main ]] || { + echo "${_Dbg_pname}: cannot read debugger file $_Dbg_libdir/$_Dbg_main." >&2 + echo "${_Dbg_pname}: Perhaps bashdb is installed incorrectly." >&2 + exit 1 +} + . ${_Dbg_libdir}/dbg-main.sh # Note that this is called via kshdb rather than "ksh --debugger" or kshdb-trace kshdb.in @@ -19,14 +19,14 @@ typeset -A _Dbg_aliases # Add an new alias in the alias table -function _Dbg_alias_add { +_Dbg_alias_add() { (( $# != 2 )) && return 1 _Dbg_aliases[$1]=$2 return 0 } # Remove alias $1 from our list of command aliases. -function _Dbg_alias_remove { +_Dbg_alias_remove() { (( $# != 1 )) && return 1 unset "_Dbg_aliases[$1]" return 0 @@ -34,7 +34,7 @@ function _Dbg_alias_remove { # Expand alias $1. The result is set in variable expanded_alias which # could be declared local in the caller. -function _Dbg_alias_expand { +_Dbg_alias_expand() { (( $# != 1 )) && return 1 expanded_alias=$1 [[ -n ${_Dbg_aliases[$1]} ]] && expanded_alias=${_Dbg_aliases[$1]} lib/alias.sh @@ -179,11 +179,9 @@ function _Dbg_parse_linespec { # Function name or error * ) if _Dbg_is_function $linespec ${_Dbg_debug_debugger} ; then - set -x typeset -a word==( $(typeset -p +f $linespec) ) typeset -r fn=${word[1]%\(\)} echo "${word[3]} 1 ${word[4]}" - set +x else echo '' fi lib/fns.sh @@ -1,14 +1,18 @@ -#!@BASH_PROG@ +#!@SH_PROG@ # -*- shell-script -*- +PS4='(${.sh.file}:${LINENO}): ${.sh.fun} - [${.sh.subshell}] +' test_alias() { _Dbg_alias_add q quit - _Dbg_alias_expand q expanded_alias - assertEquals 'quit' $expanded_alias + unset expanded_alias + _Dbg_alias_expand q + assertEquals 'quit' "$expanded_alias" _Dbg_alias_remove q - _Dbg_alias_expand q expanded_alias - assertEquals 'q' $expanded_alias + unset expanded_alias + _Dbg_alias_expand q + assertEquals 'q' "$expanded_alias" } # Make sure @top_builddir@ has a trailing slash test/unit/test-alias.sh.in @@ -1,4 +1,4 @@ -#!@KSH_PROG@ +#!@SH_PROG@ # -*- shell-script -*- PS4='(${.sh.file}:${LINENO}): ${.sh.fun} - [${.sh.subshell}] test/unit/test-columns.sh.in @@ -1,4 +1,4 @@ -#!@KSH_PROG@ +#!@SH_PROG@ # -*- shell-script -*- test_copies() test/unit/test-fns.sh.in @@ -1,4 +1,4 @@ -#!@KSH_PROG@ +#!@SH_PROG@ # -*- shell-script -*- test_undefined() test/unit/test-io.sh.in @@ -1,4 +1,4 @@ -#!@KSH_PROG@ +#!@SH_PROG@ # -*- shell-script -*- test_msg() test/unit/test-msg.sh.in @@ -1,4 +1,4 @@ -#!@KSH_PROG@ +#!@SH_PROG@ # -*- shell-script -*- do_test() test/unit/test-pre.sh.in @@ -1,4 +1,4 @@ -#!@KSH_PROG@ +#!@SH_PROG@ # -*- shell-script -*- test_not_running() test/unit/test-run.sh.in @@ -1,4 +1,4 @@ -#!@KSH_PROG@ +#!@SH_PROG@ # -*- shell-script -*- test_set_debugger_internal() test/unit/test-save-restore.sh.in 5ac06bd8524051597b1232069a96d71e322b99bf R. Bernstein rocky@gnu.org http://github.com/rocky/kshdb/commit/d85b9939fe2ddd1c67e24a5e93c99d72a5efd1f2 d85b9939fe2ddd1c67e24a5e93c99d72a5efd1f2 2008-08-16T09:53:42-07:00 2008-08-16T09:53:42-07:00 Add options processing. KSH_PROG->SH_PROG. 26ee0541a5ec9ea1e062938fb8ca54351a98d4e9 R. Bernstein rocky@gnu.org