1. Various detail changes to remove some more warning with -w on

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 1450a6c644cccaa3eb214a26d3e393b1102e0fa0..de59160663c080356a11a354c5a52b098f0f3ea1 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -199,20 +199,25 @@ sub run_cmd
                        ($path, $fcmd) = search($main::localcmd, $cmd, "pl");
                        ($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
 
-                       dbg('command', "path: $cmd cmd: $fcmd");
+                       if ($path && $cmd) {
+                               dbg('command', "path: $cmd cmd: $fcmd");
                        
-                       my $package = find_cmd_name($path, $fcmd);
-                       @ans = (0) if !$package ;
-                       
-                       if ($package) {
-                               dbg('command', "package: $package");
+                               my $package = find_cmd_name($path, $fcmd);
+                               @ans = (0) if !$package ;
                                
-                               my $c = qq{ \@ans = $package(\$self, \$args) };
-                               dbg('eval', "cluster cmd = $c\n");
-                               eval  $c;
-                               if ($@) {
-                                       @ans = (0, "Syserr: Eval err cached $package\n$@");
+                               if ($package) {
+                                       dbg('command', "package: $package");
+                                       
+                                       my $c = qq{ \@ans = $package(\$self, \$args) };
+                                       dbg('eval', "cluster cmd = $c\n");
+                                       eval  $c;
+                                       if ($@) {
+                                               @ans = (0, "Syserr: Eval err cached $package\n$@");
+                                       }
                                }
+                       } else {
+                               dbg('command', "cmd: $cmd not found");
+                               @ans = (0);
                        }
                }
        }
@@ -264,7 +269,8 @@ sub finish
                open(I, "$main::data/logout") or confess;
                my @in = <I>;
                close(I);
-               $self->sendnow('D', @in);
+               $self->send_now('D', @in);
+               sleep(1);
        }
 
        if ($call eq $main::myalias) { # unset the channel if it is us really
@@ -289,9 +295,7 @@ sub finish
 sub prompt
 {
        my $self = shift;
-       my $call = $self->{call};
-       $self->send($self->msg('pr', $call));
-       #DXChannel::msg($self, 'pr', $call);
+       $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call));
 }
 
 # broadcast a message to all users [except those mentioned after buffer]
@@ -468,7 +472,7 @@ sub find_cmd_name {
        
        # return if we can't find it
        $errstr = undef;
-       if (undef $mtime) {
+       unless (defined $mtime) {
                $errstr = DXM::msg('e1');
                return undef;
        }
@@ -479,6 +483,8 @@ sub find_cmd_name {
                #print STDERR "already compiled $package->handler\n";
                ;
        } else {
+               delete_package($package) if defined $Cache{$package}{mtime};
+               
                my $fh = new FileHandle;
                if (!open $fh, $filename) {
                        $errstr = "Syserr: can't open '$filename' $!";
@@ -489,11 +495,7 @@ sub find_cmd_name {
                close $fh;
                
                #wrap the code into a subroutine inside our unique package
-               my $eval = qq{ 
-                       sub $package 
-                       { 
-                        $sub 
-                       } };
+               my $eval = qq{ sub $package { $sub } };
                
                if (isdbg('eval')) {
                        my @list = split /\n/, $eval;
@@ -515,7 +517,7 @@ sub find_cmd_name {
                        delete_package($package);
                } else {
                        #cache it unless we're cleaning out each time
-                       $Cache{$package}{mtime} = $mtime;
+                       $Cache{$package}{'mtime'} = $mtime;
                }
        }