#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
-# $Id$
+#
#
package DXDebug;
use DXUtil;
use DXLog ();
use Carp ();
+use POSIX qw(isatty);
%dbglevel = ();
$fp = undef;
$keepdays = 10;
$cleandays = 100;
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+our $no_stdout; # set if not running in a terminal
# Avoid generating "subroutine redefined" warnings with the following
# hack (from CGI::Carp):
my @l = split /\n/, $r;
for (@l) {
s/([\x00-\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
- print "$_\n" if defined \*STDOUT;
+ print "$_\n" if defined \*STDOUT && !$no_stdout;
my $str = "$t^$_";
&$callback($str) if $callback;
$fp->writeunix($t, $str);
$callback = shift;
# add sig{__DIE__} handling
- if (!defined $DB::VERSION) {
+ unless (defined $DB::VERSION) {
$SIG{__WARN__} = sub {
if ($_[0] =~ /Deep\s+recursion/i) {
dbg($@);
};
$SIG{__DIE__} = sub { dbg($@); dbg(Carp::longmess(@_)); };
+
+ # switch off STDOUT printing if we are not talking to a TTY
+ unless ($^O =~ /^MS/ || $^O =~ /^OS-2/) {
+ unless (isatty(STDOUT->fileno)) {
+ ++$no_stdout;
+ }
+ }
}
$fp = DXLog::new('debug', 'dat', 'd');
sub dbgdump
{
+ return unless $fp;
+
my $l = shift;
my $m = shift;
- if ($fp && ($dbglevel{$l} || $l eq 'err')) {
+ if ($dbglevel{$l} || $l eq 'err') {
foreach my $l (@_) {
for (my $o = 0; $o < length $l; $o += 16) {
my $c = substr $l, $o, 16;