move the handling of unprintable characters out of IntMsg

[spider.git] / perl / IntMsg.pm

diff --git a/perl/IntMsg.pm b/perl/IntMsg.pm
index 510a1f9a661ab03162ba9370c68ab5e3f4a56730..95c6ac74347793ce9f38f27d8af303bbe1265930 100644 (file)
--- a/perl/IntMsg.pm
+++ b/perl/IntMsg.pm
@@ -34,17 +34,16 @@ sub dequeue
 {
        my $conn = shift;
 
-       if ($conn && $conn->{msg} =~ /\n/) {
-               my @lines = split /\r?\n/, $conn->{msg};
-               if ($conn->{msg} =~ /\n$/) {
+       if ($conn && $conn->{msg} =~ /\cJ/) {
+               my @lines =  $conn->{msg} =~ /([^\cM\cJ]*)\cM?\cJ/g;
+               if ($conn->{msg} =~ /\cJ$/) {
                        delete $conn->{msg};
                } else {
-                       $conn->{msg} = pop @lines;
+                       $conn->{msg} =~ s/([^\cM\cJ]*)\cM?\cJ//g;
                }
                for (@lines) {
                        if (defined $_) {
                                s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
-                               s/[\x00-\x08\x0a-\x19\x1b-\x1f\x80-\x9f]/./g;         # immutable CSI sequence + control characters
                        } else {
                                $_ = '';
                        }