diff options
| author | Andy Dougherty <doughera.lafayette.edu> | 1995-12-08 00:34:53 +0000 |
|---|---|---|
| committer | Andy Dougherty <doughera.lafayette.edu> | 1995-12-08 00:34:53 +0000 |
| commit | 3712091946b37b5feabcc1f630b32639406ad717 (patch) | |
| tree | 95688437cf1016cf9fa191b44e7c97d20eb24fd5 /lib/diagnostics.pm | |
| parent | 4e68a2086f0b5bfb6d7944f2efbad03461f54f71 (diff) | |
| download | perl-3712091946b37b5feabcc1f630b32639406ad717.tar.gz | |
This is patch.2b1f to perl5.002beta1.
cd to your perl source directory, execute the command above, and type
patch -p1 -N < patch.2b1f
This patch includes patches for the following items:
Changes.Conf
Configure
MANIFEST
Makefile.SH
XSUB.h
ext/POSIX/POSIX.pm
ext/POSIX/POSIX.pod
ext/POSIX/POSIX.xs
ext/Socket/Socket.pm
gv.c
lib/Cwd.pm
lib/Sys/Syslog.pm
lib/diagnostics.pm
t/lib/socket.t
toke.c
The changes are described after each /^Index/ line below.
These are each described in detail below, after the corresponding
index line.
Patch and enjoy,
Andy Dougherty doughera@lafcol.lafayette.edu
Dept. of Physics
Lafayette College, Easton PA 18042
Diffstat (limited to 'lib/diagnostics.pm')
| -rwxr-xr-x | lib/diagnostics.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/diagnostics.pm b/lib/diagnostics.pm index 073a456c81..6016d961d8 100755 --- a/lib/diagnostics.pm +++ b/lib/diagnostics.pm @@ -1,6 +1,6 @@ #!/usr/local/bin/perl eval 'exec perl -S $0 ${1+"$@"}' - if $0; + if 0; use Config; $diagnostics::PODFILE= $Config{privlib} . "/pod/perldiag.pod"; @@ -406,14 +406,14 @@ sub warn_trap { if (caller eq $WHOAMI or !splainthis($warning)) { print STDERR $warning; } - &$oldwarn if $oldwarn and $oldwarn ne \&warn_trap; + &$oldwarn if defined $oldwarn and $oldwarn and $oldwarn ne \&warn_trap; }; sub death_trap { my $exception = $_[0]; splainthis($exception); if (caller eq $WHOAMI) { print STDERR "INTERNAL EXCEPTION: $exception"; } - &$olddie if defined $olddie and $olddie ne \&death_trap; + &$olddie if defined $olddie and $olddie and $olddie ne \&death_trap; $SIG{__DIE__} = $SIG{__WARN__} = ''; confess "Uncaught exception from user code:\n\t$exception Bailing out"; # up we go; where we stop, nobody knows, but i think we die now |