2. handle @gb7tlh.#35.eu type addresses as well

[spider.git] / perl / DXMsg.pm

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 46280dfa32dddeeefddf1264de642b2c4a1860a9..3d83359d350e911eef0a374f4dc109c568e84d09 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -1207,7 +1207,7 @@ sub import_one
                                
        # first line;
        my $line = shift @$ref;
-       my @f = split /\s+/, $line;
+       my @f = split /\b/, $line;
        unless (@f && $f[0] =~ /^(:?S|SP|SB|SEND)$/ ) {
                my $m = "invalid first line in import '$line'";
                dbg($m) if isdbg('msg');
@@ -1224,7 +1224,7 @@ sub import_one
                        ;
                } elsif ($notincalls && ($f eq 'RR')) {
                        $rr = '1';
-               } elsif ($f eq '@' && @f) {       # this is bbs syntax, for AT
+               } elsif (($f =~ /^[\@\.\#]$/ || $f eq '.#') && @f) {       # this is bbs syntax, for AT
                        shift @f;
                } elsif ($f eq '<' && @f) {     # this is bbs syntax  for from call
                        $from = uc shift @f;