use Carp;
use Minimuf;
use DXDb;
+use Sun;
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
$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";
$self->send($self->msg('page', scalar @ans));
} else {
for (@ans) {
- s/\s+$//o; # why ?????????
- $self->send($_);
+ $self->send($_) if $_;
}
}
}
$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) {
# 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");
}
$Cache{$package}->{sub} = $c;
}
$c = $Cache{$package}->{sub};
- @ans = &{$c}($self, $args);
+ eval {
+ @ans = &{$c}($self, $args);
+ };
+
+ return ($@) if $@;
}
} else {
dbg('command', "cmd: $cmd not found");