require Exporter;
@ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbgstore dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck cluck);
+@EXPORT = qw(dbginit dbgstore dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck);
use strict;
use vars qw(%dbglevel $fp);
use DXUtil;
use DXLog ();
-use Carp qw(cluck);
+use Carp ();
%dbglevel = ();
$fp = undef;
CORE::die(Carp::shortmess($@)) if $@;
} else {
- eval qq( sub confess { Carp::confess(\@_); };
- sub cluck { Carp::cluck(\@_); };
+ eval qq( sub confess { die Carp::longmess(\@_); };
+ sub croak { die Carp::shortmess(\@_); };
+ sub cluck { warn Carp::longmess(\@_); };
+ sub carp { warn Carp::shortmess(\@_); };
);
}
{
my $t = time;
for (@_) {
- chomp;
- my @l = split /\n/;
+ my $r = $_;
+ chomp $r;
+ my @l = split /\n/, $r;
for (@l) {
- my $l = $_;
- $l =~ s/([\x00\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
- print "$l\n" if defined \*STDOUT;
- $fp->writeunix($t, "$t^$l");
+ s/([\x00-\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+ print "$_\n" if defined \*STDOUT;
+ $fp->writeunix($t, "$t^$_");
}
}
}
{
# add sig{__DIE__} handling
if (!defined $DB::VERSION) {
- $SIG{__WARN__} = sub { dbgstore($@, Carp::shortmess(@_)); };
+ $SIG{__WARN__} = sub {
+ if ($_[0] =~ /Deep\s+recursion/i) {
+ dbgstore($@, Carp::longmess(@_));
+ CORE::die;
+ } else {
+ dbgstore($@, Carp::shortmess(@_));
+ }
+ };
+
$SIG{__DIE__} = sub { dbgstore($@, Carp::longmess(@_)); };
}