X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fwatchdbg;h=8d9551d3db9e1cb366defc6186484a19a741964c;hb=refs%2Fheads%2Fnew-spawn;hp=92765ab4132f0ee913e0e32c8b4ae442be8dafc0;hpb=78cf2dcb9be8128af7f8dc5ae37540c9c53c6057;p=spider.git

diff --git a/perl/watchdbg b/perl/watchdbg
index 92765ab4..8d9551d3 100755
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -6,7 +6,7 @@
 # examples:-
 # 
 #   watchdbg g1tlh       # watch everything g1tlh does
-#   watchdbg 2 PCPROT       # watch all PCPROT messages + up to 2 lines before
+#   watchdbg -2 PCPROT       # watch all PCPROT messages + up to 2 lines before
 #   watchdbg gb7baa gb7djk   # watch the conversation between BAA and DJK 
 #
 
@@ -23,15 +23,15 @@ BEGIN {
 }
 
 use IO::File;
-use DXVars;
+use SysVar;
 use DXUtil;
 use DXLog;
 
 use strict;
 
 my $fp = DXLog::new('debug', 'dat', 'd');
-my @today = Julian::unixtoj(time()); 
-my $fh = $fp->open(@today) or die $!; 
+my $today = $fp->unixtoj(time()); 
+my $fh = $fp->open($today) or die $!; 
 my $nolines = 1;
 $nolines = shift if $ARGV[0] =~ /^-?\d+$/;
 $nolines = abs $nolines if $nolines < 0;  
@@ -41,7 +41,7 @@ my @prev;
 # seek to end of file
 $fh->seek(0, 2);
 for (;;) {
-	my $line = <$fh>;
+	my $line = $fh->getline;
 	if ($line) {
 		if ($exp) {
 			push @prev, $line;
@@ -58,16 +58,16 @@ for (;;) {
 		
 		# check that the debug hasn't rolled over to next day
 		# open it if it has
-		my @now = Julian::unixtoj(time()); 
-		if ($today[1] != $now[1]) {
+		my $now = $fp->unixtoj(time()); 
+		if ($today->cmp($now)) {
 			$fp->close;
 			my $i;
 			for ($i = 0; $i < 20; $i++) {
-				last if $fh = $fp->open(@now);
+				last if $fh = $fp->open($now);
 				sleep 5;
 			}
 		 	die $! if $i >= 20; 
-			@today = @now;
+			$today = $now;
 		}
 	}
 }
@@ -79,10 +79,8 @@ sub printit
 		chomp $line;
 		$line =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
 		my ($t, $l) =  split /\^/, $line, 2;
-		my ($sec,$min,$hour) = gmtime((defined $t) ? $t : time);
-		my $buf = sprintf "%02d:%02d:%02d", $hour, $min, $sec;
-		
-		print $buf, ' ', $l, "\n"; 
+		$t = time unless defined $t;
+		printf "%02d:%02d:%02d %s\n", (gmtime($t))[2,1,0], $l; 
 	}
 }
 exit(0);