Watchdbg, grepdbg args change, fix pc92c for rbn

[spider.git] / perl / watchdbg

diff --git a/perl/watchdbg b/perl/watchdbg
index 8d9551d3db9e1cb366defc6186484a19a741964c..a497eff92957f5bb269c7c1ce062f08c9acb83cd 100755 (executable)
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -3,6 +3,10 @@
 # watch the end of the current debug file (like tail -f) applying
 # any regexes supplied on the command line.
 #
+# There can be more than one <regexp>. a <regexp> preceeded by a '!' is
+# treated as NOT <regexp>. Each <regexp> is implcitly ANDed together.
+# All <regexp> are caseless.
+#
 # examples:-
 # 
 #   watchdbg g1tlh       # watch everything g1tlh does
@@ -35,7 +39,7 @@ my $fh = $fp->open($today) or die $!;
 my $nolines = 1;
 $nolines = shift if $ARGV[0] =~ /^-?\d+$/;
 $nolines = abs $nolines if $nolines < 0;  
-my $exp = join '|', @ARGV;
+my @patt = @ARGV;
 my @prev;
 
 # seek to end of file
@@ -43,10 +47,20 @@ $fh->seek(0, 2);
 for (;;) {
        my $line = $fh->getline;
        if ($line) {
-               if ($exp) {
+               if (@patt) {
                        push @prev, $line;
                        shift @prev while @prev > $nolines; 
-                       if ($line =~ m{(?:$exp)}oi) {
+                       my $flag = 0;
+                       foreach my $p (@patt) {
+                               if ($p =~ /^!/) {
+                                       my $r = substr $p, 1;
+                                       last if $line =~ m{$r}i;
+                               } else {
+                                       last unless $line =~ m{$p}i;
+                               }
+                               ++$flag;
+                       }               
+                       if ($flag == @patt) {
                                printit(@prev); 
                                @prev = ();
                        }
@@ -80,7 +94,7 @@ sub printit
                $line =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
                my ($t, $l) =  split /\^/, $line, 2;
                $t = time unless defined $t;
-               printf "%02d:%02d:%02d %s\n", (gmtime($t))[2,1,0], $l; 
+               printf "%02d:%02d:%02d %s\n", (gmtime($t))[2,1,0], $l;
        }
 }
 exit(0);