Ilya's new debugger.

3 files changed, 1682 insertions, 4 deletions

diff --git a/lib/dumpvar.pl b/lib/dumpvar.pl
index 4ebcb5203d..c78319b539 100644
--- a/lib/dumpvar.pl
+++ b/lib/dumpvar.pl
@@ -1,3 +1,376 @@
+require 5.002;			# For (defined ref)
+package dumpvar;
+
+# Needed for PrettyPrinter only:
+
+# require 5.001;  # Well, it coredumps anyway undef DB in 5.000 (not now)
+
+# translate control chars to ^X - Randal Schwartz
+# Modifications to print types by Peter Gordon v1.0
+
+# Ilya Zakharevich -- patches after 5.001 (and some before ;-)
+
+# Won't dump symbol tables and contents of debugged files by default
+
+$winsize = 80 unless defined $winsize;
+
+
+# Defaults
+
+# $globPrint = 1;
+$printUndef = 1 unless defined $printUndef;
+$tick = "'" unless defined $tick;
+$unctrl = 'quote' unless defined $unctrl;
+
+sub main::dumpValue {
+  local %address;
+  (print "undef\n"), return unless defined $_[0];
+  (print &stringify($_[0]), "\n"), return unless ref $_[0];
+  dumpvar::unwrap($_[0],0);
+}
+
+# This one is good for variable names:
+
+sub unctrl {
+	local($_) = @_;
+	local($v) ; 
+
+	return \$_ if ref \$_ eq "GLOB";
+	s/([\001-\037\177])/'^'.pack('c',ord($1)^64)/eg;
+	$_;
+}
+
+sub stringify {
+	local($_,$noticks) = @_;
+	local($v) ; 
+
+	return 'undef' unless defined $_ or not $printUndef;
+	return $_ . "" if ref \$_ eq 'GLOB';
+	if ($tick eq "'") {
+	  s/([\'\\])/\\$1/g;
+	} elsif ($unctrl eq 'unctrl') {
+	  s/([\"\\])/\\$1/g ;
+	  s/([\000-\037\177])/'^'.pack('c',ord($1)^64)/eg;
+	  s/([\200-\377])/'\\0x'.sprintf('%2X',ord($1))/eg 
+	    if $quoteHighBit;
+	} elsif ($unctrl eq 'quote') {
+	  s/([\"\\\$\@])/\\$1/g if $tick eq '"';
+	  s/\033/\\e/g;
+	  s/([\000-\037\177])/'\\c'.chr(ord($1)^64)/eg;
+	}
+	s/([\200-\377])/'\\'.sprintf('%3o',ord($1))/eg if $quoteHighBit;
+	($noticks || /^\d+(\.\d*)?\Z/) 
+	  ? $_ 
+	  : $tick . $_ . $tick;
+}
+
+sub ShortArray {
+  my $tArrayDepth = $#{$_[0]} ; 
+  $tArrayDepth = $#{$_[0]} < $arrayDepth-1 ? $#{$_[0]} : $arrayDepth-1 
+    unless  $arrayDepth eq '' ; 
+  my $shortmore = "";
+  $shortmore = " ..." if $tArrayDepth < $#{$_[0]} ;
+  if (!grep(ref $_, @{$_[0]})) {
+    $short = "0..$#{$_[0]}  '" . 
+      join("' '", @{$_[0]}[0..$tArrayDepth]) . "'$shortmore";
+    return $short if length $short <= $compactDump;
+  }
+  undef;
+}
+
+sub DumpElem {
+  my $short = &stringify($_[0], ref $_[0]);
+  if ($veryCompact && ref $_[0]
+      && (ref $_[0] eq 'ARRAY' and !grep(ref $_, @{$_[0]}) )) {
+    my $end = "0..$#{$v}  '" . 
+      join("' '", @{$_[0]}[0..$tArrayDepth]) . "'$shortmore";
+  } elsif ($veryCompact && ref $_[0]
+      && (ref $_[0] eq 'HASH') and !grep(ref $_, values %{$_[0]})) {
+    my $end = 1;
+	  $short = $sp . "0..$#{$v}  '" . 
+	    join("' '", @{$v}[0..$tArrayDepth]) . "'$shortmore";
+  } else {
+    print "$short\n";
+    unwrap($_[0],$_[1]);
+  }
+}
+
+sub unwrap {
+    return if $DB::signal;
+    local($v) = shift ; 
+    local($s) = shift ; # extra no of spaces
+    local(%v,@v,$sp,$value,$key,$type,@sortKeys,$more,$shortmore,$short) ;
+    local($tHashDepth,$tArrayDepth) ;
+
+    $sp = " " x $s ;
+    $s += 3 ; 
+
+    # Check for reused addresses
+    if (ref $v) { 
+      ($address) = $v =~ /(0x[0-9a-f]+)/ ; 
+      if (defined $address) { 
+	($type) = $v =~ /=(.*?)\(/ ;
+	$address{$address}++ ;
+	if ( $address{$address} > 1 ) { 
+	  print "${sp}-> REUSED_ADDRESS\n" ; 
+	  return ; 
+	} 
+      }
+    } elsif (ref \$v eq 'GLOB') {
+      $address = "$v" . "";	# To avoid a bug with globs
+      $address{$address}++ ;
+      if ( $address{$address} > 1 ) { 
+	print "${sp}*DUMPED_GLOB*\n" ; 
+	return ; 
+      } 
+    }
+
+    if ( ref $v eq 'HASH' or $type eq 'HASH') { 
+	@sortKeys = sort keys(%$v) ;
+	undef $more ; 
+	$tHashDepth = $#sortKeys ; 
+	$tHashDepth = $#sortKeys < $hashDepth-1 ? $#sortKeys : $hashDepth-1
+	  unless $hashDepth eq '' ; 
+	$more = "....\n" if $tHashDepth < $#sortKeys ; 
+	$shortmore = "";
+	$shortmore = ", ..." if $tHashDepth < $#sortKeys ; 
+	$#sortKeys = $tHashDepth ; 
+	if ($compactDump && !grep(ref $_, values %{$v})) {
+	  #$short = $sp . 
+	  #  (join ', ', 
+# Next row core dumps during require from DB on 5.000, even with map {"_"}
+	  #   map {&stringify($_) . " => " . &stringify($v->{$_})} 
+	  #   @sortKeys) . "'$shortmore";
+	  $short = $sp;
+	  my @keys;
+	  for (@sortKeys) {
+	    push @keys, &stringify($_) . " => " . &stringify($v->{$_});
+	  }
+	  $short .= join ', ', @keys;
+	  $short .= $shortmore;
+	  (print "$short\n"), return if length $short <= $compactDump;
+	}
+	for $key (@sortKeys) {
+	    return if $DB::signal;
+	    $value = $ {$v}{$key} ;
+	    print "$sp", &stringify($key), " => ";
+	    DumpElem $value, $s;
+	}
+	print "$sp  empty hash\n" unless @sortKeys;
+	print "$sp$more" if defined $more ;
+    } elsif ( ref $v eq 'ARRAY' or $type eq 'ARRAY') { 
+	$tArrayDepth = $#{$v} ; 
+	undef $more ; 
+	$tArrayDepth = $#{$v} < $arrayDepth-1 ? $#{$v} : $arrayDepth-1 
+	  unless  $arrayDepth eq '' ; 
+	$more = "....\n" if $tArrayDepth < $#{$v} ; 
+	$shortmore = "";
+	$shortmore = " ..." if $tArrayDepth < $#{$v} ;
+	if ($compactDump && !grep(ref $_, @{$v})) {
+	  if ($#$v >= 0) {
+	    $short = $sp . "0..$#{$v}  '" . 
+	      join("' '", @{$v}[0..$tArrayDepth]) . "'$shortmore";
+	  } else {
+	    $short = $sp . "empty array";
+	  }
+	  (print "$short\n"), return if length $short <= $compactDump;
+	}
+	#if ($compactDump && $short = ShortArray($v)) {
+	#  print "$short\n";
+	#  return;
+	#}
+	for $num ($[ .. $tArrayDepth) {
+	    return if $DB::signal;
+	    print "$sp$num  ";
+	    DumpElem $v->[$num], $s;
+	}
+	print "$sp  empty array\n" unless @$v;
+	print "$sp$more" if defined $more ;  
+    } elsif ( ref $v eq 'SCALAR' or ref $v eq 'REF' or $type eq 'SCALAR' ) { 
+	    print "$sp-> ";
+	    DumpElem $$v, $s;
+    } elsif (ref $v eq 'GLOB') {
+      print "$sp-> ",&stringify($$v,1),"\n";
+      if ($globPrint) {
+	$s += 3;
+	dumpglob($s, "{$$v}", $$v, 1);
+      } elsif (defined ($fileno = fileno($v))) {
+	print( (' ' x ($s+3)) .  "FileHandle({$$v}) => fileno($fileno)\n" );
+      }
+    } elsif (ref \$v eq 'GLOB') {
+      if ($globPrint) {
+	dumpglob($s, "{$v}", $v, 1) if $globPrint;
+      } elsif (defined ($fileno = fileno(\$v))) {
+	print( (' ' x $s) .  "FileHandle({$v}) => fileno($fileno)\n" );
+      }
+    }
+}
+
+sub matchvar {
+  $_[0] eq $_[1] or 
+    ($_[1] =~ /^([!~])(.)/) and 
+      ($1 eq '!') ^ (eval {($_[2] . "::" . $_[0]) =~ /$2$'/});
+}
+
+sub compactDump {
+  $compactDump = shift if @_;
+  $compactDump = 6*80-1 if $compactDump and $compactDump < 2;
+  $compactDump;
+}
+
+sub veryCompact {
+  $veryCompact = shift if @_;
+  compactDump(1) if !$compactDump and $veryCompact;
+  $veryCompact;
+}
+
+sub unctrlSet {
+  if (@_) {
+    my $in = shift;
+    if ($in eq 'unctrl' or $in eq 'quote') {
+      $unctrl = $in;
+    } else {
+      print "Unknown value for `unctrl'.\n";
+    }
+  }
+  $unctrl;
+}
+
+sub quote {
+  if (@_ and $_[0] eq '"') {
+    $tick = '"';
+    $unctrl = 'quote';
+  } elsif (@_) {		# Need to set
+    $tick = "'";
+    $unctrl = 'unctrl';
+  }
+  $tick;
+}
+
+sub dumpglob {
+    return if $DB::signal;
+    my ($off,$key, $val, $all) = @_;
+    local(*entry) = $val;
+    my $fileno;
+    if (defined $entry) {
+      print( (' ' x $off) . "\$", &unctrl($key), " = " );
+      DumpElem $entry, 3+$off;
+    }
+    if (($key !~ /^_</ or $dumpDBFiles) and defined @entry) {
+      print( (' ' x $off) . "\@$key = (\n" );
+      unwrap(\@entry,3+$off) ;
+      print( (' ' x $off) .  ")\n" );
+    }
+    if ($key ne "main::" && $key ne "DB::" && defined %entry
+	&& ($dumpPackages or $key !~ /::$/)
+	&& !($package eq "dumpvar" and $key eq "stab")) {
+      print( (' ' x $off) . "\%$key = (\n" );
+      unwrap(\%entry,3+$off) ;
+      print( (' ' x $off) .  ")\n" );
+    }
+    if (defined ($fileno = fileno(*entry))) {
+      print( (' ' x $off) .  "FileHandle($key) => fileno($fileno)\n" );
+    }
+    if ($all) {
+      if (defined &entry) {
+	my $sub = $key;
+	$sub = $1 if $sub =~ /^\{\*(.*)\}$/;
+	my $place = $DB::sub{$sub};
+	$place = '???' unless defined $place;
+	print( (' ' x $off) .  "&$sub in $place\n" );
+      }
+    }
+}
+
+sub main::dumpvar {
+    my ($package,@vars) = @_;
+    local(%address,$key,$val);
+    $package .= "::" unless $package =~ /::$/;
+    *stab = *{"main::"};
+    while ($package =~ /(\w+?::)/g){
+      *stab = $ {stab}{$1};
+    }
+    local $TotalStrings = 0;
+    local $Strings = 0;
+    local $CompleteTotal = 0;
+    while (($key,$val) = each(%stab)) {
+      return if $DB::signal;
+      next if @vars && !grep( matchvar($key, $_), @vars );
+      if ($usageOnly) {
+	globUsage(\$val, $key) unless $package eq 'dumpvar' and $key eq 'stab';
+      } else {
+	dumpglob(0,$key, $val);
+      }
+    }
+    if ($usageOnly) {
+      print "String space: $TotalStrings bytes in $Strings strings.\n";
+      $CompleteTotal += $TotalStrings;
+      print "Grand total = $CompleteTotal bytes (1 level deep) + overhead.\n";
+    }
+}
+
+sub scalarUsage {
+  my $size = length($_[0]);
+  $TotalStrings += $size;
+  $Strings++;
+  $size;
+}
+
+sub arrayUsage {		# array ref, name
+  my $size = 0;
+  map {$size += scalarUsage($_)} @{$_[0]};
+  my $len = @{$_[0]};
+  print "\@$_[1] = $len item", ($len > 1 ? "s" : ""),
+    " (data: $size bytes)\n"
+      if defined $_[1];
+  $CompleteTotal +=  $size;
+  $size;
+}
+
+sub hashUsage {		# hash ref, name
+  my @keys = keys %{$_[0]};
+  my @values = values %{$_[0]};
+  my $keys = arrayUsage \@keys;
+  my $values = arrayUsage \@values;
+  my $len = @keys;
+  my $total = $keys + $values;
+  print "\%$_[1] = $len item", ($len > 1 ? "s" : ""),
+    " (keys: $keys; values: $values; total: $total bytes)\n"
+      if defined $_[1];
+  $total;
+}
+
+sub globUsage {			# glob ref, name
+  local *name = *{$_[0]};
+  $total = 0;
+  $total += scalarUsage $name if defined $name;
+  $total += arrayUsage \@name, $_[1] if defined @name;
+  $total += hashUsage \%name, $_[1] if defined %name and $_[1] ne "main::" 
+    and $_[1] ne "DB::";   #and !($package eq "dumpvar" and $key eq "stab"));
+  $total;
+}
+
+sub packageUsage {
+  my ($package,@vars) = @_;
+  $package .= "::" unless $package =~ /::$/;
+  local *stab = *{"main::"};
+  while ($package =~ /(\w+?::)/g){
+    *stab = $ {stab}{$1};
+  }
+  local $TotalStrings = 0;
+  local $CompleteTotal = 0;
+  my ($key,$val);
+  while (($key,$val) = each(%stab)) {
+    next if @vars && !grep($key eq $_,@vars);
+    globUsage \$val, $key unless $package eq 'dumpvar' and $key eq 'stab';
+  }
+  print "String space: $TotalStrings.\n";
+  $CompleteTotal += $TotalStrings;
+  print "\nGrand total = $CompleteTotal bytes\n";
+}
+
+1;
+
 package dumpvar;
 
 # translate control chars to ^X - Randal Schwartz
diff --git a/lib/perl5db.pl b/lib/perl5db.pl
index 15a2498324..f6e8ecae47 100644
--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
@@ -1,5 +1,1300 @@
 package DB;
 
+# Debugger for Perl 5.001m; perl5db.pl patch level:
+
+$header = 'perl5db.pl patch level 0.93';
+
+# Enhanced by ilya@math.ohio-state.edu (Ilya Zakharevich)
+# Latest version available: ftp://ftp.math.ohio-state.edu/pub/users/ilya/perl
+
+# modified Perl debugger, to be run from Emacs in perldb-mode
+# Ray Lischner (uunet!mntgfx!lisch) as of 5 Nov 1990
+# Johan Vromans -- upgrade to 4.0 pl 10
+# Ilya Zakharevich -- patches after 5.001 (and some before ;-)
+
+#
+# This file is automatically included if you do perl -d.
+# It's probably not useful to include this yourself.
+#
+# Perl supplies the values for @line and %sub.  It effectively inserts
+# a &DB'DB(<linenum>); in front of every place that can have a
+# breakpoint. Instead of a subroutine call it calls &DB::sub with
+# $DB::sub being the called subroutine. It also inserts a BEGIN
+# {require 'perl5db.pl'} before the first line.
+#
+# Note that no subroutine call is possible until &DB::sub is defined
+# (for subroutines defined outside this file). In fact the same is
+# true if $deep is not defined.
+#
+# $Log:	perldb.pl,v $
+
+#
+# At start reads $rcfile that may set important options.  This file
+# may define a subroutine &afterinit that will be executed after the
+# debugger is initialized.
+#
+# After $rcfile is read reads environment variable PERLDB_OPTS and parses
+# it as a rest of `O ...' line in debugger prompt.
+#
+# The options that can be specified only at startup:
+# [To set in $rcfile, call &parse_options("optionName=new_value").]
+#
+# TTY  - the TTY to use for debugging i/o.
+#
+# noTTY - if set, goes in NonStop mode.  On interrupt if TTY is not set
+# uses the value of noTTY or "/tmp/perldbtty$$" to find TTY using
+# Term::Rendezvous.  Current variant is to have the name of TTY in this
+# file.
+#
+# ReadLine - If false, dummy ReadLine is used, so you can debug
+# ReadLine applications.
+#
+# NonStop - if true, no i/o is performed until interrupt.
+#
+# LineInfo - file or pipe to print line number info to.  If it is a
+# pipe, a short "emacs like" message is used.
+#
+# Example $rcfile: (delete leading hashes!)
+#
+# &parse_options("NonStop=1 LineInfo=db.out");
+# sub afterinit { $trace = 1; }
+#
+# The script will run without human intervention, putting trace
+# information into db.out.  (If you interrupt it, you would better
+# reset LineInfo to something "interactive"!)
+#
+
+
+local($^W) = 0;
+warn (			# Do not ;-)
+      $dumpvar::hashDepth,     
+      $dumpvar::arrayDepth,    
+      $dumpvar::dumpDBFiles,   
+      $dumpvar::dumpPackages,  
+      $dumpvar::quoteHighBit,  
+      $dumpvar::printUndef,    
+      $dumpvar::globPrint,     
+      $readline::Tk_toloop,    
+      $dumpvar::usageOnly,
+      @ARGS,
+      $Carp::CarpLevel,
+     ) if 0;
+
+# $prevwarn = $prevdie = $prevbus = $prevsegv = ''; # Does not help?!
+
+$trace = $signal = $single = 0;	# Uninitialized warning suppression
+                                # (local $^W cannot help - other packages!).
+@stack = (0);
+
+$option{PrintRet} = 1;
+
+@options     = qw(hashDepth arrayDepth DumpDBFiles DumpPackages 
+		  compactDump veryCompact quote HighBit undefPrint
+		  globPrint PrintRet UsageOnly frame
+		  TTY noTTY ReadLine NonStop LineInfo
+		  recallCommand ShellBang pager tkRunning
+		  signalLevel warnLevel dieLevel);
+
+%optionVars    = (
+		 hashDepth	=> \$dumpvar::hashDepth,
+		 arrayDepth	=> \$dumpvar::arrayDepth,
+		 DumpDBFiles	=> \$dumpvar::dumpDBFiles,
+		 DumpPackages	=> \$dumpvar::dumpPackages,
+		 HighBit	=> \$dumpvar::quoteHighBit,
+		 undefPrint	=> \$dumpvar::printUndef,
+		 globPrint	=> \$dumpvar::globPrint,
+		 tkRunning	=> \$readline::Tk_toloop,
+		 UsageOnly	=> \$dumpvar::usageOnly,     
+		  frame           => \$frame,
+);
+
+%optionAction  = (
+		  compactDump	=> \&dumpvar::compactDump,
+		  veryCompact	=> \&dumpvar::veryCompact,
+		  quote		=> \&dumpvar::quote,
+		  TTY		=> \&TTY,
+		  noTTY		=> \&noTTY,
+		  ReadLine	=> \&ReadLine,
+		  NonStop	=> \&NonStop,
+		  LineInfo	=> \&LineInfo,
+		  recallCommand	=> \&recallCommand,
+		  ShellBang	=> \&shellBang,
+		  pager		=> \&pager,
+		  signalLevel	=> \&signalLevel,
+		  warnLevel	=> \&warnLevel,
+		  dieLevel	=> \&dieLevel,
+		 );
+
+%optionRequire = (
+		  compactDump	=> 'dumpvar.pl',
+		  veryCompact	=> 'dumpvar.pl',
+		  quote		=> 'dumpvar.pl',
+		 );
+
+# These guys may be defined in $ENV{PERL5DB} :
+$rl = 1 unless defined $rl;
+warnLevel($warnLevel);
+dieLevel($dieLevel);
+signalLevel($signalLevel);
+&pager(defined($ENV{PAGER}) ? $ENV{PAGER} : "|more") unless defined $pager;
+&recallCommand("!") unless defined $prc;
+&shellBang("!") unless defined $psh;
+
+if (-e "/dev/tty") {
+  $rcfile=".perldb";
+} else {
+  $rcfile="perldb.ini";
+}
+
+if (-f $rcfile) {
+    do "./$rcfile";
+} elsif (defined $ENV{LOGDIR} and -f "$ENV{LOGDIR}/$rcfile") {
+    do "$ENV{LOGDIR}/$rcfile";
+} elsif (defined $ENV{HOME} and -f "$ENV{HOME}/$rcfile") {
+    do "$ENV{HOME}/$rcfile";
+}
+
+if (defined $ENV{PERLDB_OPTS}) {
+  parse_options($ENV{PERLDB_OPTS});
+}
+
+if ($notty) {
+  $runnonstop = 1;
+} else {
+  # Is Perl being run from Emacs?
+  $emacs = ((defined $main::ARGV[0]) and ($main::ARGV[0] eq '-emacs'));
+  $rl = 0, shift(@main::ARGV) if $emacs;
+
+  #require Term::ReadLine;
+
+  if (-e "/dev/tty") {
+    $console = "/dev/tty";
+  } elsif (-e "con") {
+    $console = "con";
+  } else {
+    $console = "sys\$command";
+  }
+
+  # Around a bug:
+  if (defined $ENV{OS2_SHELL} and $emacs) { # In OS/2
+    $console = undef;
+  }
+
+  $console = $tty if defined $tty;
+
+  if (defined $console) {
+    open(IN,"+<$console") || open(IN,"<$console") || open(IN,"<&STDIN");
+    open(OUT,"+>$console") || open(OUT,">$console") || open(OUT,">&STDERR")
+      || open(OUT,">&STDOUT");	# so we don't dongle stdout
+  } else {
+    open(IN,"<&STDIN");
+    open(OUT,">&STDERR") || open(OUT,">&STDOUT"); # so we don't dongle stdout
+    $console = 'STDIN/OUT';
+  }
+  # so open("|more") can read from STDOUT and so we don't dingle stdin
+  $IN = \*IN;
+
+  $OUT = \*OUT;
+  select($OUT);
+  $| = 1;			# for DB::OUT
+  select(STDOUT);
+
+  $LINEINFO = $OUT unless defined $LINEINFO;
+  $lineinfo = $console unless defined $lineinfo;
+
+  $| = 1;			# for real STDOUT
+
+  $header =~ s/.Header: ([^,]+),v(\s+\S+\s+\S+).*$/$1$2/;
+  unless ($runnonstop) {
+    print $OUT "\nLoading DB routines from $header\n";
+    print $OUT ("Emacs support ",
+		$emacs ? "enabled" : "available",
+		".\n");
+    print $OUT "\nEnter h or `h h' for help.\n\n";
+  }
+}
+
+@ARGS = @ARGV;
+for (@args) {
+    s/\'/\\\'/g;
+    s/(.*)/'$1'/ unless /^-?[\d.]+$/;
+}
+
+if (defined &afterinit) {	# May be defined in $rcfile
+  &afterinit();
+}
+
+############################################################ Subroutines
+
+# The following code may be executed now, but gives FPE later:
+# BEGIN {warn 5}
+
+sub DB {
+    if ($runnonstop) {		# Disable until signal
+	for ($i=0; $i <= $#stack; ) {
+	    $stack[$i++] &= ~1;
+	}
+	$single = $runnonstop = 0; # Once only
+	return;
+    }
+    &save;
+    if ($doret) {
+	$doret = 0;
+	if ($option{PrintRet}) {
+	    print $OUT "$retctx context return from $lastsub:", 
+	      ($retctx eq 'list') ? "\n" : " " ;
+	    dumpit( ($retctx eq 'list') ? \@ret : $ret );
+	}
+    }
+    ($package, $filename, $line) = caller;
+    $usercontext = '($@, $!, $,, $/, $\, $^W) = @saved;' .
+      "package $package;";	# this won't let them modify, alas
+    local(*dbline) = "::_<$filename";
+    $max = $#dbline;
+    if (($stop,$action) = split(/\0/,$dbline{$line})) {
+	if ($stop eq '1') {
+	    $signal |= 1;
+	} else {
+	    $evalarg = "\$DB::signal |= do {$stop;}"; &eval;
+	    $dbline{$line} =~ s/;9($|\0)/$1/;
+	}
+    }
+    if ($single || $trace || $signal) {
+	$term || &setterm;
+	if ($emacs) {
+	    print $LINEINFO "\032\032$filename:$line:0\n";
+	} else {
+	    $sub =~ s/\'/::/;
+	    $prefix = $sub =~ /::/ ? "" : "${'package'}::";
+	    $prefix .= "$sub($filename:";
+	    $after = ($dbline[$line] =~ /\n$/ ? '' : "\n");
+	    if (length($prefix) > 30) {
+		print $LINEINFO "$prefix$line):\n$line:\t", $dbline[$line], $after;
+		$prefix = "";
+		$infix = ":\t";
+	    } else {
+		$infix = "):\t";
+		print $LINEINFO "$prefix$line$infix",$dbline[$line], $after;
+	    }
+	    for ($i = $line + 1; $i <= $max && $dbline[$i] == 0; ++$i) { #{ vi
+		last if $dbline[$i] =~ /^\s*[\;\}\#\n]/;
+		$after = ($dbline[$i] =~ /\n$/ ? '' : "\n");
+		print $LINEINFO "$prefix$i$infix", $dbline[$i], $after;
+	    }
+	}
+    }
+    $evalarg = $action, &eval if $action;
+    if ($single || $signal) {
+	local $level = $level + 1;
+	$evalarg = $pre, &eval if $pre;
+	print $OUT $#stack . " levels deep in subroutine calls!\n"
+	  if $single & 4;
+	$start = $line;
+      CMD:
+	while (($term || &setterm),
+	       defined ($cmd=$term->readline("  DB" . ('<' x $level) .
+					     ($#hist+1) . ('>' x $level) .
+					     " "))) {
+	    {			# <-- Do we know what this brace is for?
+		$single = 0;
+		$signal = 0;
+		$cmd =~ s/\\$/\n/ && do {
+		    $cmd .= $term->readline("  cont: ");
+		    redo CMD;
+		};
+		$cmd =~ /^q$/ && exit 0;
+		$cmd =~ /^$/ && ($cmd = $laststep);
+		push(@hist,$cmd) if length($cmd) > 1;
+	      PIPE: {
+		    ($i) = split(/\s+/,$cmd);
+		    eval "\$cmd =~ $alias{$i}", print $OUT $@ if $alias{$i};
+		    $cmd =~ /^h$/ && do {
+			print $OUT $help;
+			next CMD; };
+		    $cmd =~ /^h\s+h$/ && do {
+			print $OUT $summary;
+			next CMD; };
+		    $cmd =~ /^h\s+(\S)$/ && do {
+			my $asked = "\Q$1";
+			if ($help =~ /^($asked([\s\S]*?)\n)(\Z|[^\s$asked])/m) {
+			    print $OUT $1;
+			} else {
+			    print $OUT "`$asked' is not a debugger command.\n";
+			}
+			next CMD; };
+		    $cmd =~ /^t$/ && do {
+			$trace = !$trace;
+			print $OUT "Trace = ".($trace?"on":"off")."\n";
+			next CMD; };
+		    $cmd =~ /^S(\s+(!)?(.+))?$/ && do {
+			$Srev = defined $2; $Spatt = $3; $Snocheck = ! defined $1;
+			foreach $subname (sort(keys %sub)) {
+			    if ($Snocheck or $Srev^($subname =~ /$Spatt/)) {
+				print $OUT $subname,"\n";
+			    }
+			}
+			next CMD; };
+		    $cmd =~ s/^X\b/V $package/;
+		    $cmd =~ /^V$/ && do {
+			$cmd = "V $package"; };
+		    $cmd =~ /^V\b\s*(\S+)\s*(.*)/ && do {
+			local ($savout) = select($OUT);
+			$packname = $1;
+			@vars = split(' ',$2);
+			do 'dumpvar.pl' unless defined &main::dumpvar;
+			if (defined &main::dumpvar) {
+			    &main::dumpvar($packname,@vars);
+			} else {
+			    print $OUT "dumpvar.pl not available.\n";
+			}
+			select ($savout);
+			next CMD; };
+		    $cmd =~ s/^x\b/ / && do { # So that will be evaled
+			$onetimeDump = 1; };
+		    $cmd =~ /^f\b\s*(.*)/ && do {
+			$file = $1;
+			if (!$file) {
+			    print $OUT "The old f command is now the r command.\n";
+			    print $OUT "The new f command switches filenames.\n";
+			    next CMD;
+			}
+			if (!defined $main::{'_<' . $file}) {
+			    if (($try) = grep(m#^_<.*$file#, keys %main::)) {{
+					      $file = substr($try,2);
+					      print "\n$file:\n";
+					  }}
+			}
+			if (!defined $main::{'_<' . $file}) {
+			    print $OUT "There's no code here matching $file.\n";
+			    next CMD;
+			} elsif ($file ne $filename) {
+			    *dbline = "::_<$file";
+			    $max = $#dbline;
+			    $filename = $file;
+			    $start = 1;
+			    $cmd = "l";
+			} };
+		    $cmd =~ /^l\b\s*([\':A-Za-z_][\':\w]*)/ && do {
+			$subname = $1;
+			$subname =~ s/\'/::/;
+			$subname = "main::".$subname unless $subname =~ /::/;
+			$subname = "main".$subname if substr($subname,0,2) eq "::";
+			@pieces = split(/:/,$sub{$subname});
+			$subrange = pop @pieces;
+			$file = join(':', @pieces);
+			if ($file ne $filename) {
+			    *dbline = "::_<$file";
+			    $max = $#dbline;
+			    $filename = $file;
+			}
+			if ($subrange) {
+			    if (eval($subrange) < -$window) {
+				$subrange =~ s/-.*/+/;
+			    }
+			    $cmd = "l $subrange";
+			} else {
+			    print $OUT "Subroutine $subname not found.\n";
+			    next CMD;
+			} };
+		    $cmd =~ /^w\b\s*(\d*)$/ && do {
+			$incr = $window - 1;
+			$start = $1 if $1;
+			$start -= $preview;
+			$cmd = 'l ' . $start . '-' . ($start + $incr); };
+		    $cmd =~ /^-$/ && do {
+			$incr = $window - 1;
+			$cmd = 'l ' . ($start-$window*2) . '+'; };
+		    $cmd =~ /^l$/ && do {
+			$incr = $window - 1;
+			$cmd = 'l ' . $start . '-' . ($start + $incr); };
+		    $cmd =~ /^l\b\s*(\d*)\+(\d*)$/ && do {
+			$start = $1 if $1;
+			$incr = $2;
+			$incr = $window - 1 unless $incr;
+			$cmd = 'l ' . $start . '-' . ($start + $incr); };
+		    $cmd =~ /^l\b\s*(([\d\$\.]+)([-,]([\d\$\.]+))?)?/ && do {
+			$end = (!$2) ? $max : ($4 ? $4 : $2);
+			$end = $max if $end > $max;
+			$i = $2;
+			$i = $line if $i eq '.';
+			$i = 1 if $i < 1;
+			if ($emacs) {
+			    print $OUT "\032\032$filename:$i:0\n";
+			    $i = $end;
+			} else {
+			    for (; $i <= $end; $i++) {
+				print $OUT "$i:\t", $dbline[$i];
+				last if $signal;
+			    }
+			}
+			$start = $i; # remember in case they want more
+			$start = $max if $start > $max;
+			next CMD; };
+		    $cmd =~ /^D$/ && do {
+			print $OUT "Deleting all breakpoints...\n";
+			for ($i = 1; $i <= $max ; $i++) {
+			    if (defined $dbline{$i}) {
+				$dbline{$i} =~ s/^[^\0]+//;
+				if ($dbline{$i} =~ s/^\0?$//) {
+				    delete $dbline{$i};
+				}
+			    }
+			}
+			next CMD; };
+		    $cmd =~ /^L$/ && do {
+			for ($i = 1; $i <= $max; $i++) {
+			    if (defined $dbline{$i}) {
+				print $OUT "$i:\t", $dbline[$i];
+				($stop,$action) = split(/\0/, $dbline{$i});
+				print $OUT "  break if (", $stop, ")\n"
+				  if $stop;
+				print $OUT "  action:  ", $action, "\n"
+				  if $action;
+				last if $signal;
+			    }
+			}
+			next CMD; };
+		    $cmd =~ /^b\b\s*([':A-Za-z_][':\w]*)\s*(.*)/ && do {
+			$subname = $1;
+			$cond = $2 || '1';
+			$subname =~ s/\'/::/;
+			$subname = "${'package'}::" . $subname
+			  unless $subname =~ /::/;
+			$subname = "main".$subname if substr($subname,0,2) eq "::";
+			# Filename below can contain ':'
+			($file,$i) = ($sub{$subname} =~ /^(.*):(.*)$/);
+			$i += 0;
+			if ($i) {
+			    $filename = $file;
+			    *dbline = "::_<$filename";
+			    $max = $#dbline;
+			    ++$i while $dbline[$i] == 0 && $i < $max;
+			    $dbline{$i} =~ s/^[^\0]*/$cond/;
+			} else {
+			    print $OUT "Subroutine $subname not found.\n";
+			}
+			next CMD; };
+		    $cmd =~ /^b\b\s*(\d*)\s*(.*)/ && do {
+			$i = ($1?$1:$line);
+			$cond = $2 || '1';
+			if ($dbline[$i] == 0) {
+			    print $OUT "Line $i not breakable.\n";
+			} else {
+			    $dbline{$i} =~ s/^[^\0]*/$cond/;
+			}
+			next CMD; };
+		    $cmd =~ /^d\b\s*(\d+)?/ && do {
+			$i = ($1?$1:$line);
+			$dbline{$i} =~ s/^[^\0]*//;
+			delete $dbline{$i} if $dbline{$i} eq '';
+			next CMD; };
+		    $cmd =~ /^A$/ && do {
+			for ($i = 1; $i <= $max ; $i++) {
+			    if (defined $dbline{$i}) {
+				$dbline{$i} =~ s/\0[^\0]*//;
+				delete $dbline{$i} if $dbline{$i} eq '';
+			    }
+			}
+			next CMD; };
+		    $cmd =~ /^O\s*$/ && do {
+			for (@options) {
+			    &dump_option($_);
+			}
+			next CMD; };
+		    $cmd =~ /^O\s*(\S.*)/ && do {
+			parse_options($1);
+			next CMD; };
+		    $cmd =~ /^<\s*(.*)/ && do {
+			$pre = action($1);
+			next CMD; };
+		    $cmd =~ /^>\s*(.*)/ && do {
+			$post = action($1);
+			next CMD; };
+		    $cmd =~ /^a\b\s*(\d+)(\s+(.*))?/ && do {
+			$i = $1; $j = $3;
+			if ($dbline[$i] == 0) {
+			    print $OUT "Line $i may not have an action.\n";
+			} else {
+			    $dbline{$i} =~ s/\0[^\0]*//;
+			    $dbline{$i} .= "\0" . action($j);
+			}
+			next CMD; };
+		    $cmd =~ /^n$/ && do {
+			$single = 2;
+			$laststep = $cmd;
+			last CMD; };
+		    $cmd =~ /^s$/ && do {
+			$single = 1;
+			$laststep = $cmd;
+			last CMD; };
+		    $cmd =~ /^c\b\s*(\d*)\s*$/ && do {
+			$i = $1;
+			if ($i) {
+			    if ($dbline[$i] == 0) {
+				print $OUT "Line $i not breakable.\n";
+				next CMD;
+			    }
+			    $dbline{$i} =~ s/($|\0)/;9$1/; # add one-time-only b.p.
+			}
+			for ($i=0; $i <= $#stack; ) {
+			    $stack[$i++] &= ~1;
+			}
+			last CMD; };
+		    $cmd =~ /^r$/ && do {
+			$stack[$#stack] |= 1;
+			$doret = 1;
+			last CMD; };
+		    $cmd =~ /^T$/ && do {
+			local($p,$f,$l,$s,$h,$a,$e,$r,@a,@sub);
+			for ($i = 1; 
+			     ($p,$f,$l,$s,$h,$w,$e,$r) = caller($i); 
+			     $i++) {
+			    @a = ();
+			    for $arg (@args) {
+				$_ = "$arg";
+				s/([\'\\])/\\$1/g;
+				s/([^\0]*)/'$1'/
+				  unless /^(?: -?[\d.]+ | \*[\w:]* )$/x;
+				s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg;
+				s/([\0-\37\177])/sprintf("^%c",ord($1)^64)/eg;
+				push(@a, $_);
+			    }
+			    $w = $w ? '@ = ' : '$ = ';
+			    $a = $h ? '(' . join(', ', @a) . ')' : '';
+			    $e =~ s/\n\s*\;\s*\Z// if $e;
+			    $e =~ s/[\\\']/\\$1/g if $e;
+			    if ($r) {
+			      $s = "require '$e'";
+			    } elsif (defined $r) {
+			      $s = "eval '$e'";
+			    } elsif ($s eq '(eval)') {
+			      $s = "eval {...}";
+			    }
+			    $f = "file `$f'" unless $f eq '-e';
+			    push(@sub, "$w$s$a called from $f line $l\n");
+			    last if $signal;
+			}
+			for ($i=0; $i <= $#sub; $i++) {
+			    last if $signal;
+			    print $OUT $sub[$i];
+			}
+			next CMD; };
+		    $cmd =~ /^\/(.*)$/ && do {
+			$inpat = $1;
+			$inpat =~ s:([^\\])/$:$1:;
+			if ($inpat ne "") {
+			    eval '$inpat =~ m'."\a$inpat\a";	
+			    if ($@ ne "") {
+				print $OUT "$@";
+				next CMD;
+			    }
+			    $pat = $inpat;
+			}
+			$end = $start;
+			eval '
+			    for (;;) {
+				++$start;
+				$start = 1 if ($start > $max);
+				last if ($start == $end);
+				if ($dbline[$start] =~ m' . "\a$pat\a" . 'i) {
+				    if ($emacs) {
+					print $OUT "\032\032$filename:$start:0\n";
+				    } else {
+					print $OUT "$start:\t", $dbline[$start], "\n";
+				    }
+				    last;
+				}
+			    } ';
+			print $OUT "/$pat/: not found\n" if ($start == $end);
+			next CMD; };
+		    $cmd =~ /^\?(.*)$/ && do {
+			$inpat = $1;
+			$inpat =~ s:([^\\])\?$:$1:;
+			if ($inpat ne "") {
+			    eval '$inpat =~ m'."\a$inpat\a";	
+			    if ($@ ne "") {
+				print $OUT "$@";
+				next CMD;
+			    }
+			    $pat = $inpat;
+			}
+			$end = $start;
+			eval '
+			    for (;;) {
+				--$start;
+				$start = $max if ($start <= 0);
+				last if ($start == $end);
+				if ($dbline[$start] =~ m' . "\a$pat\a" . 'i) {
+				    if ($emacs) {
+					print $OUT "\032\032$filename:$start:0\n";
+				    } else {
+					print $OUT "$start:\t", $dbline[$start], "\n";
+				    }
+				    last;
+				}
+			    } ';
+			print $OUT "?$pat?: not found\n" if ($start == $end);
+			next CMD; };
+		    $cmd =~ /^$rc+\s*(-)?(\d+)?$/ && do {
+			pop(@hist) if length($cmd) > 1;
+			$i = $1 ? ($#hist-($2?$2:1)) : ($2?$2:$#hist);
+			$cmd = $hist[$i] . "\n";
+			print $OUT $cmd;
+			redo CMD; };
+		    $cmd =~ /^$sh$sh\s*/ && do {
+			&system($');
+			next CMD; };
+		    $cmd =~ /^$rc([^$rc].*)$/ && do {
+			$pat = "^$1";
+			pop(@hist) if length($cmd) > 1;
+			for ($i = $#hist; $i; --$i) {
+			    last if $hist[$i] =~ /$pat/;
+			}
+			if (!$i) {
+			    print $OUT "No such command!\n\n";
+			    next CMD;
+			}
+			$cmd = $hist[$i] . "\n";
+			print $OUT $cmd;
+			redo CMD; };
+		    $cmd =~ /^$sh$/ && do {
+			&system($ENV{SHELL}||"/bin/sh");
+			next CMD; };
+		    $cmd =~ /^$sh\s*/ && do {
+			&system($ENV{SHELL}||"/bin/sh","-c",$');
+			next CMD; };
+		    $cmd =~ /^H\b\s*(-(\d+))?/ && do {
+			$end = $2?($#hist-$2):0;
+			$hist = 0 if $hist < 0;
+			for ($i=$#hist; $i>$end; $i--) {
+			    print $OUT "$i: ",$hist[$i],"\n"
+			      unless $hist[$i] =~ /^.?$/;
+			};
+			next CMD; };
+		    $cmd =~ s/^p$/print \$DB::OUT \$_/;
+		    $cmd =~ s/^p\b/print \$DB::OUT /;
+		    $cmd =~ /^=/ && do {
+			if (local($k,$v) = ($cmd =~ /^=\s*(\S+)\s+(.*)/)) {
+			    $alias{$k}="s~$k~$v~";
+			    print $OUT "$k = $v\n";
+			} elsif ($cmd =~ /^=\s*$/) {
+			    foreach $k (sort keys(%alias)) {
+				if (($v = $alias{$k}) =~ s~^s\~$k\~(.*)\~$~$1~) {
+				    print $OUT "$k = $v\n";
+				} else {
+				    print $OUT "$k\t$alias{$k}\n";
+				};
+			    };
+			};
+			next CMD; };
+		    $cmd =~ /^\|\|?\s*[^|]/ && do {
+			if ($pager =~ /^\|/) {
+			    open(SAVEOUT,">&STDOUT") || &warn("Can't save STDOUT");
+			    open(STDOUT,">&OUT") || &warn("Can't redirect STDOUT");
+			} else {
+			    open(SAVEOUT,">&OUT") || &warn("Can't save DB::OUT");
+			}
+			unless ($piped=open(OUT,$pager)) {
+			    &warn("Can't pipe output to `$pager'");
+			    if ($pager =~ /^\|/) {
+				open(OUT,">&STDOUT") || &warn("Can't restore DB::OUT");
+				open(STDOUT,">&SAVEOUT")
+				  || &warn("Can't restore STDOUT");
+				close(SAVEOUT);
+			    } else {
+				open(OUT,">&STDOUT") || &warn("Can't restore DB::OUT");
+			    }
+			    next CMD;
+			}
+			$SIG{PIPE}= "DB::catch" if $pager =~ /^\|/
+			  && "" eq $SIG{PIPE}  ||  "DEFAULT" eq $SIG{PIPE};
+			$selected= select(OUT);
+			$|= 1;
+			select( $selected ), $selected= "" unless $cmd =~ /^\|\|/;
+			$cmd =~ s/^\|+\s*//;
+			redo PIPE; };
+		    # XXX Local variants do not work!
+		    $cmd =~ s/^t\s/\$DB::trace = 1;\n/;
+		    $cmd =~ s/^s\s/\$DB::single = 1;\n/ && do {$laststep = 's'};
+		    $cmd =~ s/^n\s/\$DB::single = 2;\n/ && do {$laststep = 'n'};
+		}		# PIPE:
+	    }			# <-- Do we know what this brace is for?
+	    $evalarg = "\$^D = \$^D | \$DB::db_stop;\n$cmd"; &eval;
+	    if ($onetimeDump) {
+		$onetimeDump = undef;
+	    } else {
+		print $OUT "\n";
+	    }
+	} continue {		# CMD:
+	    if ($piped) {
+		if ($pager =~ /^\|/) {
+		    $?= 0;  close(OUT) || &warn("Can't close DB::OUT");
+		    &warn( "Pager `$pager' failed: ",
+			  ($?>>8) > 128 ? ($?>>8)-256 : ($?>>8),
+			  ( $? & 128 ) ? " (core dumped)" : "",
+			  ( $? & 127 ) ? " (SIG ".($?&127).")" : "", "\n" ) if $?;
+		    open(OUT,">&STDOUT") || &warn("Can't restore DB::OUT");
+		    open(STDOUT,">&SAVEOUT") || &warn("Can't restore STDOUT");
+		    $SIG{PIPE}= "DEFAULT" if $SIG{PIPE} eq "DB::catch";
+		    # Will stop ignoring SIGPIPE if done like nohup(1)
+		    # does SIGINT but Perl doesn't give us a choice.
+		} else {
+		    open(OUT,">&SAVEOUT") || &warn("Can't restore DB::OUT");
+		}
+		close(SAVEOUT);
+		select($selected), $selected= "" unless $selected eq "";
+		$piped= "";
+	    }
+	}			# CMD:
+	if ($post) {
+	    $evalarg = $post; &eval;
+	}
+    }				# if ($single || $signal)
+    ($@, $!, $,, $/, $\, $^W) = @saved;
+    ();
+}
+
+# The following code may be executed now:
+# BEGIN {warn 4}
+
+sub sub {
+    print $LINEINFO ' ' x $#stack, "entering $sub\n" if $frame;
+    push(@stack, $single);
+    $single &= 1;
+    $single |= 4 if $#stack == $deep;
+    if (wantarray) {
+	@ret = &$sub;
+	$single |= pop(@stack);
+	$retctx = "list";
+	$lastsub = $sub;
+print $LINEINFO ' ' x $#stack, "exited $sub\n" if $frame;
+	@ret;
+    } else {
+	$ret = &$sub;
+	$single |= pop(@stack);
+	$retctx = "scalar";
+	$lastsub = $sub;
+print $LINEINFO ' ' x $#stack, "exited $sub\n" if $frame;
+	$ret;
+    }
+}
+
+sub save {
+    @saved = ($@, $!, $,, $/, $\, $^W);
+    $, = ""; $/ = "\n"; $\ = ""; $^W = 0;
+}
+
+# The following takes its argument via $evalarg to preserve current @_
+
+sub eval {
+    my @res;
+    {
+	local (@stack) = @stack; # guard against recursive debugging
+	my $otrace = $trace;
+	my $osingle = $single;
+	my $od = $^D;
+	@res = eval "$usercontext $evalarg;\n"; # '\n' for nice recursive debug
+	$trace = $otrace;
+	$single = $osingle;
+	$^D = $od;
+    }
+    my $at = $@;
+    eval "&DB::save";
+    if ($at) {
+	print $OUT $at;
+    } elsif ($onetimeDump) {
+	dumpit(\@res);
+    }
+}
+
+sub dumpit {
+    local ($savout) = select($OUT);
+    do 'dumpvar.pl' unless defined &main::dumpValue;
+    if (defined &main::dumpValue) {
+	&main::dumpValue(shift);
+    } else {
+	print $OUT "dumpvar.pl not available.\n";
+    }
+    select ($savout);    
+}
+
+sub action {
+    my $action = shift;
+    while ($action =~ s/\\$//) {
+	#print $OUT "+ ";
+	#$action .= "\n";
+	$action .= &gets;
+    }
+    $action;
+}
+
+sub gets {
+    local($.);
+    #<IN>;
+    &readline("cont: ");
+}
+
+sub system {
+    # We save, change, then restore STDIN and STDOUT to avoid fork() since
+    # many non-Unix systems can do system() but have problems with fork().
+    open(SAVEIN,"<&STDIN") || &warn("Can't save STDIN");
+    open(SAVEOUT,">&OUT") || &warn("Can't save STDOUT");
+    open(STDIN,"<&IN") || &warn("Can't redirect STDIN");
+    open(STDOUT,">&OUT") || &warn("Can't redirect STDOUT");
+    system(@_);
+    open(STDIN,"<&SAVEIN") || &warn("Can't restore STDIN");
+    open(STDOUT,">&SAVEOUT") || &warn("Can't restore STDOUT");
+    close(SAVEIN); close(SAVEOUT);
+    &warn( "(Command returned ", ($?>>8) > 128 ? ($?>>8)-256 : ($?>>8), ")",
+	  ( $? & 128 ) ? " (core dumped)" : "",
+	  ( $? & 127 ) ? " (SIG ".($?&127).")" : "", "\n" ) if $?;
+    $?;
+}
+
+sub setterm {
+    eval "require Term::ReadLine;" or die $@;
+    if ($notty) {
+	if ($tty) {
+	    open(IN,"<$tty") or die "Cannot open TTY `$TTY' for read: $!";
+	    open(OUT,">$tty") or die "Cannot open TTY `$TTY' for write: $!";
+	    $IN = \*IN;
+	    $OUT = \*OUT;
+	    my $sel = select($OUT);
+	    $| = 1;
+	    select($sel);
+	} else {
+	    eval "require Term::Rendezvous;" or die $@;
+	    my $rv = $ENV{PERLDB_NOTTY} || "/tmp/perldbtty$$";
+	    my $term_rv = new Term::Rendezvous $rv;
+	    $IN = $term_rv->IN;
+	    $OUT = $term_rv->OUT;
+	}
+    }
+    if (!$rl) {
+	$term = new Term::ReadLine::Stub 'perldb', $IN, $OUT;
+    } else {
+	$term = new Term::ReadLine 'perldb', $IN, $OUT;
+
+	$readline::rl_basic_word_break_characters .= "[:" 
+	  if defined $readline::rl_basic_word_break_characters 
+	    and index($readline::rl_basic_word_break_characters, ":") == -1;
+    }
+    $LINEINFO = $OUT unless defined $LINEINFO;
+    $lineinfo = $console unless defined $lineinfo;
+    $term->MinLine(2);
+}
+
+sub readline {
+  local $frame = 0;
+  $term->readline(@_);
+}
+
+sub dump_option {
+    my ($opt, $val)= @_;
+    if (defined $optionVars{$opt}
+	and defined $ {$optionVars{$opt}}) {
+	$val = $ {$optionVars{$opt}};
+    } elsif (defined $optionAction{$opt}
+	and defined &{$optionAction{$opt}}) {
+	$val = &{$optionAction{$opt}}();
+    } elsif (defined $optionAction{$opt}
+	     and not defined $option{$opt}
+	     or defined $optionVars{$opt}
+	     and not defined $ {$optionVars{$opt}}) {
+	$val = 'N/A';
+    } else {
+	$val = $option{$opt};
+    }
+    $val =~ s/[\\\']/\\$&/g;
+    printf $OUT "%20s = '%s'\n", $opt, $val;
+}
+
+sub parse_options {
+    local($_)= @_;
+    while ($_ ne "") {
+	s/^(\w+)(\s*$|\W)// or print($OUT "Invalid option `$_'\n"), last;
+	my ($opt,$sep) = ($1,$2);
+	my $val;
+	if ("?" eq $sep) {
+	    print($OUT "Option query `$opt?' followed by non-space `$_'\n"), last
+	      if /^\S/;
+	    #&dump_option($opt);
+	} elsif ($sep !~ /\S/) {
+	    $val = "1";
+	} elsif ($sep eq "=") {
+	    s/^(\S*)($|\s+)//;
+	    $val = $1;
+	} else { #{ to "let some poor schmuck bounce on the % key in B<vi>."
+	    my ($end) = "\\" . substr( ")]>}$sep", index("([<{",$sep), 1 ); #}
+	    s/^(([^\\$end]|\\[\\$end])*)$end($|\s+)// or
+	      print($OUT "Unclosed option value `$opt$sep$_'\n"), last;
+	    $val = $1;
+	    $val =~ s/\\([\\$end])/$1/g;
+	}
+	my ($option);
+	my $matches =
+	  grep(  /^\Q$opt/ && ($option = $_),  @options  );
+	$matches =  grep(  /^\Q$opt/i && ($option = $_),  @options  )
+	  unless $matches;
+	print $OUT "Unknown option `$opt'\n" unless $matches;
+	print $OUT "Ambiguous option `$opt'\n" if $matches > 1;
+	$option{$option} = $val if $matches == 1 and defined $val;
+	eval "require '$optionRequire{$option}'"
+	  if $matches == 1 and defined $optionRequire{$option} and defined $val;
+	$ {$optionVars{$option}} = $val 
+	  if $matches == 1
+	    and defined $optionVars{$option} and defined $val;
+	& {$optionAction{$option}} ($val) 
+	  if $matches == 1
+	    and defined $optionAction{$option}
+	      and defined &{$optionAction{$option}} and defined $val;
+	&dump_option($option) if $matches == 1 && $OUT ne \*STDERR; # Not $rcfile
+        s/^\s+//;
+    }
+}
+
+sub catch {
+    $signal = 1;
+}
+
+sub warn {
+    my($msg)= join("",@_);
+    $msg .= ": $!\n" unless $msg =~ /\n$/;
+    print $OUT $msg;
+}
+
+sub TTY {
+    if ($term) {
+	&warn("Too late to set TTY!\n") if @_;
+    } else {
+	$tty = shift if @_;
+    }
+    $tty or $console;
+}
+
+sub noTTY {
+    if ($term) {
+	&warn("Too late to set noTTY!\n") if @_;
+    } else {
+	$notty = shift if @_;
+    }
+    $notty;
+}
+
+sub ReadLine {
+    if ($term) {
+	&warn("Too late to set ReadLine!\n") if @_;
+    } else {
+	$rl = shift if @_;
+    }
+    $rl;
+}
+
+sub NonStop {
+    if ($term) {
+	&warn("Too late to set up NonStop mode!\n") if @_;
+    } else {
+	$runnonstop = shift if @_;
+    }
+    $runnonstop;
+}
+
+sub pager {
+    if (@_) {
+	$pager = shift;
+	$pager="|".$pager unless $pager =~ /^(\+?\>|\|)/;
+    }
+    $pager;
+}
+
+sub shellBang {
+    if (@_) {
+	$sh = quotemeta shift;
+	$sh .= "\\b" if $sh =~ /\w$/;
+    }
+    $psh = $sh;
+    $psh =~ s/\\b$//;
+    $psh =~ s/\\(.)/$1/g;
+    &sethelp;
+    $psh;
+}
+
+sub recallCommand {
+    if (@_) {
+	$rc = quotemeta shift;
+	$rc .= "\\b" if $rc =~ /\w$/;
+    }
+    $prc = $rc;
+    $prc =~ s/\\b$//;
+    $prc =~ s/\\(.)/$1/g;
+    &sethelp;
+    $prc;
+}
+
+sub LineInfo {
+    return $lineinfo unless @_;
+    $lineinfo = shift;
+    my $stream = ($lineinfo =~ /^(\+?\>|\|)/) ? $lineinfo : ">$lineinfo";
+    $emacs = ($stream =~ /^\|/);
+    open(LINEINFO, "$stream") || &warn("Cannot open `$stream' for write");
+    $LINEINFO = \*LINEINFO;
+    my $save = select($LINEINFO);
+    $| = 1;
+    select($save);
+    $lineinfo;
+}
+
+sub sethelp {
+    $help = "
+T		Stack trace.
+s [expr]	Single step [in expr].
+n [expr]	Next, steps over subroutine calls [in expr].
+<CR>		Repeat last n or s command.
+r		Return from current subroutine.
+c [line]	Continue; optionally inserts a one-time-only breakpoint
+		at the specified line.
+l min+incr	List incr+1 lines starting at min.
+l min-max	List lines min through max.
+l line		List single line.
+l subname	List first window of lines from subroutine.
+l		List next window of lines.
+-		List previous window of lines.
+w [line]	List window around line.
+f filename	Switch to viewing filename.
+/pattern/	Search forwards for pattern; final / is optional.
+?pattern?	Search backwards for pattern; final ? is optional.
+L		List all breakpoints and actions.
+S [[!]pattern]	List subroutine names [not] matching pattern.
+t		Toggle trace mode.
+t expr		Trace through execution of expr.
+b [line] [condition]
+		Set breakpoint; line defaults to the current execution line;
+		condition breaks if it evaluates to true, defaults to '1'.
+b subname [condition]
+		Set breakpoint at first line of subroutine.
+d [line]	Delete the breakpoint for line.
+D		Delete all breakpoints.
+a [line] command
+		Set an action to be done before the line is executed.
+		Sequence is: check for breakpoint, print line if necessary,
+		do action, prompt user if breakpoint or step, evaluate line.
+A		Delete all actions.
+V [pkg [vars]]	List some (default all) variables in package (default current).
+		Use ~pattern and !pattern for positive and negative regexps.
+X [vars]	Same as \"V currentpackage [vars]\".
+x expr		Evals expression in array context, dumps the result.
+O [opt[=val]] [opt\"val\"] [opt?]...
+		Set or query values of options.  val defaults to 1.  opt can
+		be abbreviated.  Several options can be listed.
+    recallCommand, ShellBang:	chars used to recall command or spawn shell;
+    pager:			program for output of \"|cmd\";
+  The following options affect what happens with V, X, and x commands:
+    arrayDepth, hashDepth:	print only first N elements ('' for all);
+    compactDump, veryCompact:	change style of array and hash dump;
+    globPrint:			whether to print contents of globs;
+    DumpDBFiles:		dump arrays holding debugged files;
+    DumpPackages:		dump symbol tables of packages;
+    quote, HighBit, undefPrint:	change style of string dump;
+    tkRunning:			run Tk while prompting (with ReadLine);
+    signalLevel warnLevel dieLevel:	level of verbosity;
+  Option PrintRet affects printing of return value after r command,
+         frame    affects printing messages on entry and exit from subroutines.
+		During startup options are initialized from \$ENV{PERLDB_OPTS}.
+		You can put additional initialization options TTY, noTTY,
+		ReadLine, and NonStop there.
+< command	Define command to run before each prompt.
+> command	Define command to run after each prompt.
+$prc number	Redo a previous command (default previous command).
+$prc -number	Redo number'th-to-last command.
+$prc pattern	Redo last command that started with pattern.
+		See 'O recallCommand' too.
+$psh$psh cmd  	Run cmd in a subprocess (reads from DB::IN, writes to DB::OUT)"
+  . ( $rc eq $sh ? "" : "
+$psh [cmd] 	Run cmd in subshell (forces \"\$SHELL -c 'cmd'\")." ) . "
+		See 'O shellBang' too.
+H -number	Display last number commands (default all).
+p expr		Same as \"print DB::OUT expr\" in current package.
+|dbcmd		Run debugger command, piping DB::OUT to current pager.
+||dbcmd		Same as |dbcmd but DB::OUT is temporarilly select()ed as well.
+\= [alias value]	Define a command alias, or list current aliases.
+command		Execute as a perl statement in current package.
+h [db_command]	Get help [on a specific debugger command], enter |h to page.
+h h		Summary of debugger commands.
+q or ^D		Quit.
+
+";
+    $summary = <<"END_SUM";
+List/search source lines:               Control script execution:
+  l [ln|sub]  List source code            T           Stack trace
+  -           List previous lines         s [expr]    Single step [in expr]
+  w [line]    List around line            n [expr]    Next, steps over subs
+  f filename  View source in file         <CR>        Repeat last n or s
+  /pattern/   Search forward              r           Return from subroutine
+  ?pattern?   Search backward             c [line]    Continue until line
+Debugger controls:                        L           List break pts & actions
+  O [...]     Set debugger options        t [expr]    Toggle trace [trace expr]
+  < command   Command for before prompt   b [ln] [c]  Set breakpoint
+  > command   Command for after prompt    b sub [c]   Set breakpoint for sub
+  $prc [N|pat]   Redo a previous command     d [line]    Delete a breakpoint
+  H [-num]    Display last num commands   D           Delete all breakpoints
+  = [a val]   Define/list an alias        a [ln] cmd  Do cmd before line
+  h [db_cmd]  Get help on command         A           Delete all actions
+  |[|]dbcmd   Send output to pager        $psh\[$psh\] syscmd Run cmd in a subprocess
+  q or ^D     Quit
+Data Examination:	      expr     Execute perl code, also see: s,n,t expr
+  S [[!]pat]	List subroutine names [not] matching pattern
+  V [Pk [Vars]]	List Variables in Package.  Vars can be ~pattern or !pattern.
+  X [Vars]	Same as \"V current_package [Vars]\".
+  x expr	Evals expression in array context, dumps the result.
+  p expr	Print expression (uses script's current package).
+END_SUM
+				# '); # Fix balance of Emacs parsing
+}
+
+
+sub diesignal {
+    $SIG{'ABRT'} = DEFAULT;
+    kill 'ABRT', $$ if $panic++;
+    print $DB::OUT "Got $_[0]!\n";	# in the case cannot continue
+    local $SIG{__WARN__} = '';
+    require Carp; 
+    local $Carp::CarpLevel = 2;		# mydie + confess
+    &warn(Carp::longmess("Signal @_"));
+    kill 'ABRT', $$;
+}
+
+sub dbwarn { 
+  local $SIG{__WARN__} = '';
+  require Carp; 
+  #&warn("Entering dbwarn\n");
+  my ($mysingle,$mytrace) = ($single,$trace);
+  $single = 0; $trace = 0;
+  my $mess = Carp::longmess(@_);
+  ($single,$trace) = ($mysingle,$mytrace);
+  #&warn("Warning in dbwarn\n");
+  &warn($mess); 
+  #&warn("Exiting dbwarn\n");
+}
+
+sub dbdie {
+  local $SIG{__DIE__} = '';
+  local $SIG{__WARN__} = '';
+  my $i = 0; my $ineval = 0; my $sub;
+  #&warn("Entering dbdie\n");
+  if ($dieLevel != 2) {
+    while ((undef,undef,undef,$sub) = caller(++$i)) {
+      $ineval = 1, last if $sub eq '(eval)';
+    }
+    {
+      local $SIG{__WARN__} = \&dbwarn;
+      &warn(@_) if $dieLevel > 2; # Ineval is false during destruction?
+    }
+    #&warn("dieing quietly in dbdie\n") if $ineval and $dieLevel < 2;
+    die @_ if $ineval and $dieLevel < 2;
+  }
+  require Carp; 
+  # We do not want to debug this chunk (automatic disabling works
+  # inside DB::DB, but not in Carp).
+  my ($mysingle,$mytrace) = ($single,$trace);
+  $single = 0; $trace = 0;
+  my $mess = Carp::longmess(@_);
+  ($single,$trace) = ($mysingle,$mytrace);
+  #&warn("dieing loudly in dbdie\n");
+  die $mess;
+}
+
+# sub diehard {			# Always dump, useful if fatal is
+#                                 # deeply in evals.
+#   local $SIG{__DIE__} = '';
+#   require Carp; 
+#   # We do not want to debug this (automatic disabling works inside DB::DB)
+#   my ($mysingle,$mytrace) = ($single,$trace);
+#   $single = 0; $trace = 0;
+#   my $mess = Carp::longmess(@_);
+#   ($single,$trace) = ($mysingle,$mytrace);
+#   die $mess;
+# }
+
+sub warnLevel {
+  if (@_) {
+    $prevwarn = $SIG{__WARN__} unless $warnLevel;
+    $warnLevel = shift;
+    if ($warnLevel) {
+      $SIG{__WARN__} = 'DB::dbwarn';
+    } else {
+      $SIG{__WARN__} = $prevwarn;
+    }
+  }
+  $warnLevel;
+}
+
+sub dieLevel {
+  if (@_) {
+    $prevdie = $SIG{__DIE__} unless $dieLevel;
+    $dieLevel = shift;
+    if ($dieLevel) {
+      $SIG{__DIE__} = 'DB::dbdie'; # if $dieLevel < 2;
+      #$SIG{__DIE__} = 'DB::diehard' if $dieLevel >= 2;
+      print $OUT "Stack dump during die enabled", 
+        ( $dieLevel == 1 ? " outside of evals" : ""), ".\n";
+      print $OUT "Dump printed too.\n" if $dieLevel > 2;
+    } else {
+      $SIG{__DIE__} = $prevdie;
+      print $OUT "Default die handler restored.\n";
+    }
+  }
+  $dieLevel;
+}
+
+sub signalLevel {
+  if (@_) {
+    $prevsegv = $SIG{SEGV} unless $signalLevel;
+    $prevbus = $SIG{BUS} unless $signalLevel;
+    $signalLevel = shift;
+    if ($signalLevel) {
+      $SIG{SEGV} = 'DB::diesignal';
+      $SIG{BUS} = 'DB::diesignal';
+    } else {
+      $SIG{SEGV} = $prevsegv;
+      $SIG{BUS} = $prevbus;
+    }
+  }
+  $signalLevel;
+}
+
+# The following BEGIN is very handy if debugger goes havoc, debugging debugger?
+
+BEGIN {			# This does not compile, alas.
+  $IN = \*STDIN;		# For bugs before DB::OUT has been opened
+  $OUT = \*STDERR;		# For errors before DB::OUT has been opened
+  $sh = '!';
+  $rc = ',';
+  @hist = ('?');
+  $deep = 100;			# warning if stack gets this deep
+  $window = 10;
+  $preview = 3;
+  $sub = '';
+  #$SIG{__WARN__} = "DB::dbwarn";
+  #$SIG{__DIE__} = 'DB::dbdie';
+  #$SIG{SEGV} = "DB::diesignal";
+  #$SIG{BUS} = "DB::diesignal";
+  $SIG{INT} = "DB::catch";
+  #$SIG{FPE} = "DB::catch";
+  #warn "SIGFPE installed";
+  $warnLevel = 1 unless defined $warnLevel;
+  $dieLevel = 1 unless defined $dieLevel;
+  $signalLevel = 1 unless defined $signalLevel;
+
+  $db_stop = 0;			# Compiler warning
+  $db_stop = 1 << 30;
+  $level = 0;			# Level of recursive debugging
+}
+
+#use Carp;			# This did break, left for debuggin
+
+1;
+package DB;
+
 # modified Perl debugger, to be run from Emacs in perldb-mode
 # Ray Lischner (uunet!mntgfx!lisch) as of 5 Nov 1990
 # Johan Vromans -- upgrade to 4.0 pl 10
diff --git a/lib/sigtrap.pm b/lib/sigtrap.pm
index dd4df906fa..e099ac4658 100644
--- a/lib/sigtrap.pm
+++ b/lib/sigtrap.pm
@@ -47,19 +47,29 @@ sub trap {
     syswrite(STDERR, "\n", 1);
 
     # Now go for broke.
-    for ($i = 1; ($p,$f,$l,$s,$h,$w) = caller($i); $i++) {
-	@a = ();
+    for ($i = 1; ($p,$f,$l,$s,$h,$w,$e,$r) = caller($i); $i++) {
+        @a = ();
 	for $arg (@args) {
 	    $_ = "$arg";
-	    s/'/\\'/g;
+	    s/([\'\\])/\\$1/g;
 	    s/([^\0]*)/'$1'/
-		unless /^(?: -?[\d.]+ | \*[\w:]* )$/x;
+	      unless /^(?: -?[\d.]+ | \*[\w:]* )$/x;
 	    s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg;
 	    s/([\0-\37\177])/sprintf("^%c",ord($1)^64)/eg;
 	    push(@a, $_);
 	}
 	$w = $w ? '@ = ' : '$ = ';
 	$a = $h ? '(' . join(', ', @a) . ')' : '';
+	$e =~ s/\n\s*\;\s*\Z// if $e;
+	$e =~ s/[\\\']/\\$1/g if $e;
+	if ($r) {
+	    $s = "require '$e'";
+	} elsif (defined $r) {
+	    $s = "eval '$e'";
+	} elsif ($s eq '(eval)') {
+	    $s = "eval {...}";
+	}
+	$f = "file `$f'" unless $f eq '-e';
 	$mess = "$w$s$a called from $f line $l\n";
 	syswrite(STDERR, $mess, length($mess));
     }