projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added ping and rcmd commands
[spider.git]
/
perl
/
CmdAlias.pm
diff --git
a/perl/CmdAlias.pm
b/perl/CmdAlias.pm
index e5f6686ab05811e500603b470364806f923809b0..8e7f8834ea4503f03fc1b9b805672026d2246982 100644
(file)
--- a/
perl/CmdAlias.pm
+++ b/
perl/CmdAlias.pm
@@
-41,34
+41,31
@@
use Carp;
use strict;
use strict;
-use vars qw(%alias $
cmd_mtime $localcmd_mtime $
fn $localfn);
+use vars qw(%alias $fn $localfn);
%alias = ();
%alias = ();
-$cmd_mtime = 1;
-$localcmd_mtime = 1;
-
$fn = "$main::cmd/Aliases";
$localfn = "$main::localcmd/Aliases";
$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 $@;
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();
}
#
}
#
@@
-82,8
+79,6
@@
sub get_cmd
$let = lc $let;
$let = lc $let;
- checkfiles();
-
$ref = $alias{$let};
return undef if !$ref;
$ref = $alias{$let};
return undef if !$ref;