removed more 5.004 ambiguities including making the format of data

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 12c84c009d7310d1ac7b57f163caca3f62153aaa..c516dc489049f85ee57d6cc0ae50671de48b666d 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -10,7 +10,6 @@
 package DXCommandmode;
 
 use POSIX;
-use IO::File;
 
 @ISA = qw(DXChannel);
 
@@ -27,14 +26,17 @@ use CmdAlias;
 use Filter;
 use Carp;
 use Minimuf;
+use DXDb;
+use Sun;
 
 use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
 
 %Cache = ();                                   # cache of dynamically loaded routine's mod times
 %cmd_cache = ();                               # cache of short names
 $errstr = ();                                  # error string from eval
 %aliases = ();                                 # aliases for (parts of) commands
+$scriptbase = "$main::root/scripts"; # the place where all users start scripts go
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -69,8 +71,13 @@ sub start
        $self->{consort} = $line;       # save the connection type
        
        # set some necessary flags on the user if they are connecting
-       $self->{beep} = $self->{wwv} = $self->{wx} = $self->{talk} = $self->{ann} = $self->{here} = $self->{dx} = 1;
-       #  $self->prompt() if $self->{state} =~ /^prompt/o;
+       $self->{beep} = $user->wantbeep;
+       $self->{ann} = $user->wantann;
+       $self->{wwv} = $user->wantwwv;
+       $self->{talk} = $user->wanttalk;
+       $self->{wx} = $user->wantwx;
+       $self->{dx} = $user->wantdx;
+       $self->{here} = 1;
        
        # add yourself to the database
        my $node = DXNode->get($main::mycall) or die "$main::mycall not allocated in DXNode database";
@@ -167,8 +174,7 @@ sub normal
                        $self->send($self->msg('page', scalar @ans));
                } else {
                        for (@ans) {
-                               s/\s+$//o;              # why ?????????
-                               $self->send($_);
+                               $self->send($_) if $_;
                        }
                } 
        } 
@@ -205,7 +211,8 @@ sub run_cmd
                $cmdline =~ s|//|/|og;
                
                # split the command line up into parts, the first part is the command
-               my ($cmd, $args) = $cmdline =~ /^([\S\/]+)\s*(.*)/o;
+               my ($cmd, $args) = split /\s+/, $cmdline, 2;
+               $args = "" unless $args;
                
                if ($cmd) {
                        
@@ -216,7 +223,8 @@ sub run_cmd
                        # alias it if possible
                        my $acmd = CmdAlias::get_cmd($cmd);
                        if ($acmd) {
-                               ($cmd, $args) = "$acmd $args" =~ /^([\w\/]+)\s*(.*)/o;
+                               ($cmd, $args) = split /\s+/, "$acmd $args", 2;
+                               $args = "" unless $args;
                                dbg('command', "aliased cmd: $cmd $args");
                        }
                        
@@ -233,15 +241,19 @@ sub run_cmd
                                if ($package) {
                                        dbg('command', "package: $package");
                                        my $c;
-                                       unless (exists $Cache{$package}->{sub}) {
-                                               $c = eval $Cache{$package}->{eval};
+                                       unless (exists $Cache{$package}->{'sub'}) {
+                                               $c = eval $Cache{$package}->{'eval'};
                                                if ($@) {
                                                        return ("Syserr: Syntax error in $package", $@);
                                                }
-                                               $Cache{$package}->{sub} = $c;
+                                               $Cache{$package}->{'sub'} = $c;
                                        }
-                                       $c = $Cache{$package}->{sub};
-                                       @ans = &{$c}($self, $args);
+                                       $c = $Cache{$package}->{'sub'};
+                                       eval {
+                                               @ans = &{$c}($self, $args);
+                                   };
+                                       
+                                       return ($@) if $@;
                                }
                        } else {
                                dbg('command', "cmd: $cmd not found");
@@ -347,6 +359,14 @@ sub get_all
        return @out;
 }
 
+# run a script for this user
+sub run_script
+{
+       my $self = shift;
+       my $silent = shift || 0;
+       
+}
+
 #
 # search for the command in the cache of short->long form commands
 #
@@ -487,15 +507,12 @@ sub find_cmd_name {
                #print STDERR "already compiled $package->handler\n";
                ;
        } else {
-               
-               my $fh = new IO::File;
-               if (!open $fh, $filename) {
+
+               my $sub = readfilestr($filename);
+               unless ($sub) {
                        $errstr = "Syserr: can't open '$filename' $!";
                        return undef;
                };
-               local $/ = undef;
-               my $sub = <$fh>;
-               close $fh;
                
                #wrap the code into a subroutine inside our unique package
                my $eval = qq( sub { $sub } );
@@ -508,7 +525,7 @@ sub find_cmd_name {
                        }
                }
                
-               $Cache{$package} = {mtime => $mtime, eval => $eval };
+               $Cache{$package} = {mtime => $mtime, 'eval' => $eval };
        }
 
        return $package;