part of making rcmd work again for async cmds

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 192d252fce49addc2c46c79bb40c95d5497a5f81..19396a70eff5366dbd57b945d992d9985451802b 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -407,7 +407,7 @@ push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search,
                                                                        }
                                                                }
                                                                push @out, $self->msg('e3', "sh/dx", "'$line'") unless @out;
-                                                               $dxchan->send(@out);
+                                                               return @out;
                                                        });
 
 #my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);

diff --git a/cmd/show/groups.pl b/cmd/show/groups.pl
index 26aad008a88a3dcb05a9738f88bca87c1cb48d72..8cbf54e6c2940b10faf20593b03aad0a0c84410a 100644 (file)
--- a/cmd/show/groups.pl
+++ b/cmd/show/groups.pl
@@ -103,7 +103,7 @@ sub handle
                                                                        }
                                                                        push (@out, "-");
                                                                }
-                                                               $self->send(@out) if @out;
+                                                               return @out;
                                                        });
        
        #       my @chatlog = DXLog::print(undef, $to, $main::systime, 'chat', undef);

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index cbba3b79210bf5ebfa0a77f8377ad57ff80816a6..4212d968b236aaf408288bd09a55930d0a102b8b 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -1328,9 +1328,10 @@ sub spawn_cmd
                                         return;
                                 }
                                 if ($cb) {
-                                        $cb->($dxchan, @res);
-                                } else {
-                                        return unless @res;
+                                        # transform output if required
+                                        @res = $cb->($dxchan, @res);
+                                }
+                                if (@res) {
                                         if (defined $prefix) {
                                                 $dxchan->send(map {"$prefix$_"} @res);
                                         } else {