From 428f70e71f52606449895be3d6b0d4fae7c0bc75 Mon Sep 17 00:00:00 2001
From: minima <minima>
Date: Tue, 20 Aug 2002 20:01:22 +0000
Subject: [PATCH] changed the logic a bit so that the \r and \r\n are split
 upon

---
 perl/AGWMsg.pm | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/perl/AGWMsg.pm b/perl/AGWMsg.pm
index 08660d62..693f3108 100644
--- a/perl/AGWMsg.pm
+++ b/perl/AGWMsg.pm
@@ -266,8 +266,8 @@ sub _decode
 		$data = '' unless defined $data;
 		if ($sort eq 'D') {
 			my $d = unpack "Z*", $data;
-			$d =~ s/\cJ//g;		# remove all new line characters
-			$d =~ s/\cM$//;
+			$d =~ s/\cM\cJ?$//;
+			$d =~ s/^\cJ//;
 			dbg("AGW Data In port: $port pid: $pid '$from'->'$to' length: $len \"$d\"") if isdbg('agw');
 			my $conn = _find($from eq $main::mycall ? $to : $from);
 			if ($conn) {
@@ -282,13 +282,10 @@ sub _decode
 						$conn->to_connected($conn->{call}, 'O', $conn->{csort});
 					}
 				} else {
-					my @lines = split /\cM/, $data;
-					if (@lines) {
-						for (@lines) {
-							&{$conn->{rproc}}($conn, "I$conn->{call}|$_");
-						}
-					} else {
-						&{$conn->{rproc}}($conn, "I$conn->{call}|");
+					my @lines = split /\cM\cJ?/, $d;
+					push @lines, $d unless @lines;
+					for (@lines) {
+						&{$conn->{rproc}}($conn, "I$conn->{call}|$_");
 					}
 				}
 			} else {
@@ -296,9 +293,9 @@ sub _decode
 			}
 		} elsif ($sort eq 'I' || $sort eq 'S' || $sort eq 'U' || $sort eq 'M' || $sort eq 'T') {
 			my $d = unpack "Z*", $data;
-			$d =~ s/\cJ//g;		# remove all new line characters
-			$d =~ s/\cM$//;
-			my @lines = split /\cM/, $d;
+			$d =~ s/^\cJ//;
+			$d =~ s/\cM\cJ?$//;
+			my @lines = split /\cM\cJ?/, $d;
 			
 			for (@lines) {
 #				s/([\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
@@ -306,7 +303,7 @@ sub _decode
 			}
 		} elsif ($sort eq 'C') {
 			my $d = unpack "Z*", $data;
-			$d =~ s/\cM$//;
+			$d =~ s/\cM\cJ?$//;
 			dbg("AGW Connect port: $port pid: $pid '$from'->'$to' \"$d\"") if isdbg('agw');
 			my $call = $from eq $main::mycall ? $to : $from;
 			my $conn = _find($call);
@@ -341,7 +338,7 @@ sub _decode
 			}
 		} elsif ($sort eq 'd') {
 			my $d = unpack "Z*", $data;
-			$d =~ s/\cM$//;
+			$d =~ s/\cM\cJ?$//;
 			dbg("AGW '$from'->'$to' port: $port Disconnected ($d)") if isdbg('agw');
 			my $conn = _find($from eq $main::mycall ? $to : $from);
 			if ($conn) {
@@ -361,7 +358,7 @@ sub _decode
 		} elsif ($sort eq 'H') {
 			unless ($from =~ /^\s+$/) {
 				my $d = unpack "Z*", $data;
-				$d =~ s/\cM$//;
+				$d =~ s/\cM\cJ?$//;
 				dbg("AGW Heard port: $port \"$d\"") if isdbg('agw');
 			}
 		} elsif ($sort eq 'X') {
-- 
2.34.1