make sure that the actual line is printed in grepdbg & watchdbg esp. with

ALL the '^' and leading space characters as they really are

diff --git a/Changes b/Changes
index 20cea2115f48648d924a1680cb8c3bffc3c883f2..0df34ad559544474f6ef9b6e3b6f00ecc0ccf144 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 02Aug01=======================================================================
 1. correct manual and help references on accept/route and reject/route. Thanks
 to ea1dav for pointing out the errors
+2. make sure that the actual line is printed in grepdbg & watchdbg esp. with
+ALL the '^' and leading space characters as they really are
 30Jul01=======================================================================
 1. changes to manuals to add links etc. (g0vgs)
 23Jul01=======================================================================

diff --git a/perl/grepdbg b/perl/grepdbg
index a14bf3011d36489004359304b320af3b4baf73f4..467c785330fe4db733d2689f37210bfc1a0674a6 100755 (executable)
--- a/perl/grepdbg
+++ b/perl/grepdbg
@@ -63,9 +63,8 @@ for my $entry (@list) {
                        if ($line =~ m{$string}io) {
                                for (@prev) {
                                        s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
-                                       my @line =  split '\^';
-                                       my $t = shift @line;
-                                       print atime($t), ' ', join('^', @line), "\n"; 
+                                       my ($t, $l) =  split /\^/, $line, 2;
+                                       print atime($t), ' ', $l, "\n"; 
                                }
                                @prev = ();
                        }

diff --git a/perl/watchdbg b/perl/watchdbg
index dec397091dba07d826dbc7e7eb887c8a0a98d0ca..720904bfca013ec9d54224e26a637cef38bb7d1a 100755 (executable)
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -77,12 +77,11 @@ sub printit
                my $line = shift;
                chomp $line;
                $line =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
-               my @line =  split '\^', $line;
-               my $t = shift @line;
+               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, ' ', join('^', @line), "\n"; 
+               print $buf, ' ', $l, "\n"; 
        }
 }
 exit(0);