1. Fixed problems with sh/rcmd (talk/ann/log) with a callsign as argument and

[spider.git] / cmd / show / announce.pl

diff --git a/cmd/show/announce.pl b/cmd/show/announce.pl
index 89d8719239caaf36ec360f51b652a6b4660b3b33..71b046d0cdf483aa5df7792ed4e3b1426ec220db 100644 (file)
--- a/cmd/show/announce.pl
+++ b/cmd/show/announce.pl
@@ -13,7 +13,7 @@ my $cmdline = shift;
 my @f = split /\s+/, $cmdline;
 my $f;
 my @out;
-my ($from, $to); 
+my ($from, $to, $who); 
 
 $from = 0;
 while ($f = shift @f) {                 # next field
@@ -26,9 +26,12 @@ while ($f = shift @f) {                 # next field
                ($to) = $f =~ /^(\d+)$/o if !$to;              # is it a to count?
                next if $to;
        }
+       next if $who;
+       ($who) = $f =~ /^(\w+)/o;
 }
 
-$to = 20 if !$to;
+$to = 20 unless $to;
+$from = 0 unless $from;
 
-@out = DXLog::print($from, $to, $main::systime, '^ann');
+@out = DXLog::print($from, $to, $main::systime, '^ann', $who);
 return (1, @out);