use strict;
-use vars qw(%alias $cmd_mtime $localcmd_mtime $fn $localfn);
+use vars qw(%alias $fn $localfn);
%alias = ();
-$cmd_mtime = 1;
-$localcmd_mtime = 1;
-
$fn = "$main::cmd/Aliases";
$localfn = "$main::localcmd/Aliases";
-sub checkfiles
+sub load
{
- my $m = -M $fn;
-# print "m: $m oldmtime: $cmd_mtime\n";
- if ($m < $cmd_mtime) {
- do $fn;
+ my $ref = shift;
+ if (-e $localfn) {
+ do $localfn;
+ return ($@) if $@ && ref $ref;
+ confess $@ if $@;
+ return ();
+ }
+ do $fn;
+ return ($@) if $@ && ref $ref;
confess $@ if $@;
- $cmd_mtime = $m;
- $localcmd_mtime = 0;
- }
- if (-e $localfn) {
- $m = -M $localfn;
- if ($m < $localcmd_mtime) {
- do $localfn;
- confess $@ if $@;
- $localcmd_mtime = $m;
- }
- }
+ return ();
+}
+
+sub init
+{
+ load();
}
#
$let = lc $let;
- checkfiles();
-
$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 $ri = qq{\$ro = "$ref->[$i+1]"};
my $ro;
eval $ri;
return $ro;
$let = lc $let;
- checkfiles();
-
$ref = $alias{$let};
return undef if !$ref;
$n = @{$ref};
for ($i = 0; $i < $n; $i += 3) {
if ($s =~ /$ref->[$i]/i) {
- my $ri = qq{$ref->[$i+2]};
- return $ri;
+ my $ri = qq{\$ro = "$ref->[$i+2]"};
+ my $ro;
+ eval $ri;
+ return $ro;
}
}
return undef;