From: Chip Salzenberg <chip@perl.com>
Date: Tue, 25 Feb 1997 01:58:14 +0000 (+1200)
Subject: Don't require() in a signal handler
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ee85b803feacbb40e8592bf6e4ffe4e533862c00;p=p5sagit%2Fp5-mst-13.2.git

Don't require() in a signal handler
---

diff --git a/lib/perl5db.pl b/lib/perl5db.pl
index 738937f..11d0de7 100644
--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
@@ -2,7 +2,7 @@ package DB;
 
 # Debugger for Perl 5.00x; perl5db.pl patch level:
 
-$VERSION = 0.9905;
+$VERSION = 0.9906;
 $header = "perl5db.pl patch level $VERSION";
 
 # Enhanced by ilya@math.ohio-state.edu (Ilya Zakharevich)
@@ -1736,11 +1736,14 @@ sub diesignal {
     local $doret = -2;
     $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 @_"));
+    if (defined &Carp::longmess) {
+	local $SIG{__WARN__} = '';
+	local $Carp::CarpLevel = 2;		# mydie + confess
+	&warn(Carp::longmess("Signal @_"));
+    }
+    else {
+	print $DB::OUT "Got signal @_\n";
+    }
     kill 'ABRT', $$;
 }