projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. Sysops can now have full privileges if there is a ExtMsg listener on
[spider.git]
/
perl
/
CmdAlias.pm
diff --git
a/perl/CmdAlias.pm
b/perl/CmdAlias.pm
index 1f418967c30cae00ca096045b25bc35462cbc089..39136bd1b333fd7f5e293e31d656a8108eb16ee8 100644
(file)
--- a/
perl/CmdAlias.pm
+++ b/
perl/CmdAlias.pm
@@
-21,13
+21,13
@@
package CmdAlias;
use DXVars;
use DXDebug;
use DXVars;
use DXDebug;
-use Carp;
use strict;
use strict;
-use vars qw(%alias $fn $localfn);
+use vars qw(%alias
%newalias
$fn $localfn);
%alias = ();
%alias = ();
+%newalias = ();
$fn = "$main::cmd/Aliases";
$localfn = "$main::localcmd/Aliases";
$fn = "$main::cmd/Aliases";
$localfn = "$main::localcmd/Aliases";
@@
-35,15
+35,28
@@
$localfn = "$main::localcmd/Aliases";
sub load
{
my $ref = shift;
sub load
{
my $ref = shift;
+
+ do $fn;
+ return ($@) if $@ && ref $ref;
+ confess $@ if $@;
if (-e $localfn) {
if (-e $localfn) {
+ my %oldalias = %alias;
+ local %alias; # define a local one
+
do $localfn;
return ($@) if $@ && ref $ref;
confess $@ if $@;
do $localfn;
return ($@) if $@ && ref $ref;
confess $@ if $@;
- return ();
+ my $let;
+ foreach $let (keys %alias) {
+ # stick any local definitions at the front
+ my @a;
+ push @a, (@{$alias{$let}});
+ push @a, (@{$oldalias{$let}}) if exists $oldalias{$let};
+ $oldalias{$let} = \@a;
+ }
+ %newalias = %oldalias;
}
}
- do $fn;
- return ($@) if $@ && ref $ref;
- confess $@ if $@;
+ %alias = %newalias if -e $localfn;
return ();
}
return ();
}
@@
-57,25
+70,25
@@
sub init
#
sub get_cmd
{
#
sub get_cmd
{
- my $s = shift;
- my ($let) = unpack "A1", $s;
- my ($i, $n, $ref);
-
- $let = lc $let;
-
- $ref = $alias{$let};
- return undef if !$ref;
-
- $n = @{$ref};
- for ($i = 0; $i < $n; $i += 3) {
- if ($s =~ /$ref->[$i]/i) {
- my $ri = qq{\$ro = "$ref->[$i+1]"};
- my $ro;
- eval $ri;
- return $ro;
+ my $s = shift;
+ my ($let) = unpack "A1", $s;
+ my ($i, $n, $ref);
+
+ $let = lc $let;
+
+ $ref = $alias{$let};
+ return undef if !$ref;
+
+ $n = @{$ref};
+ for ($i = 0; $i < $n; $i += 3) {
+ if ($s =~ /$ref->[$i]/i) {
+ my $ri = qq{\$ro = "$ref->[$i+1]"};
+ my $ro;
+ eval $ri;
+ return $ro;
+ }
}
}
- }
- return undef;
+ return undef;
}
#
}
#
@@
-83,25
+96,25
@@
sub get_cmd
#
sub get_hlp
{
#
sub get_hlp
{
- my $s = shift;
- my ($let) = unpack "A1", $s;
- my ($i, $n, $ref);
-
- $let = lc $let;
-
- $ref = $alias{$let};
- return undef if !$ref;
-
- $n = @{$ref};
- for ($i = 0; $i < $n; $i += 3) {
- if ($s =~ /$ref->[$i]/i) {
- my $ri = qq{\$ro = "$ref->[$i+2]"};
- my $ro;
- eval $ri;
- return $ro;
+ my $s = shift;
+ my ($let) = unpack "A1", $s;
+ my ($i, $n, $ref);
+
+ $let = lc $let;
+
+ $ref = $alias{$let};
+ return undef if !$ref;
+
+ $n = @{$ref};
+ for ($i = 0; $i < $n; $i += 3) {
+ if ($s =~ /$ref->[$i]/i) {
+ my $ri = qq{\$ro = "$ref->[$i+2]"};
+ my $ro;
+ eval $ri;
+ return $ro;
+ }
}
}
- }
- return undef;
+ return undef;
}
}