FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-12 22:56:34 +00:00
Code Issues Releases Wiki Activity

fhem.pl: Try to fix $DEV replace anomaly (Forum #70789)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14046 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-04-20 18:48:47 +00:00
parent 0d136c9e1f
commit 44f04083c8
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/fhem.pl
View File

@ -1015,7 +1015,7 @@ AnalyzeCommandChain($$;$)
my $subcmd;
while(defined($subcmd = shift @cmdList)) {
$subcmd =~ s/SeMiCoLoN/;/g;
my $lret = AnalyzeCommand($c, $subcmd);
my $lret = AnalyzeCommand($c, $subcmd, "ACC");
push(@ret, $lret) if(defined($lret));
}
@cmdList = @saveCmdList;
@ -1077,14 +1077,17 @@ AnalyzePerlCommand($$;$)
sub
AnalyzeCommand($$;$)
{
my ($cl, $cmd) = @_; # third parmeter is deprecated
my ($cl, $cmd, $calledFromChain) = @_;
$cmd = "" if(!defined($cmd)); # Forum #29963
$cmd =~ s/^(\n|[ \t])*//;# Strip space or \n at the begginning
$cmd =~ s/[ \t]*$//;
Log 5, "Cmd: >$cmd<";
return undef if(!$cmd);
if(!$cmd) {
$evalSpecials = undef if(!$calledFromChain || $calledFromChain ne "ACC");
return undef;
}
if($cmd =~ m/^{.*}$/s) { # Perl code
return AnalyzePerlCommand($cl, $cmd, 1);
@ -1094,6 +1097,7 @@ AnalyzeCommand($$;$)
return "Forbidden command $cmd." if($cl && !Authorized($cl,"cmd","shell"));
if($evalSpecials) {
map { $ENV{substr($_,1)} = $evalSpecials->{$_}; } keys %{$evalSpecials};
$evalSpecials = undef if(!$calledFromChain || $calledFromChain ne "ACC");
}
my $out = "";
$out = ">> $currlogfile 2>&1" if($currlogfile ne "-" && $^O ne "MSWin32");
@ -1105,6 +1109,7 @@ AnalyzeCommand($$;$)
if($evalSpecials) {
map { my $n = substr($_,1); my $v = $evalSpecials->{$_};
$cmd =~ s/\$$n/$v/g; } keys %{$evalSpecials};
$evalSpecials = undef if(!$calledFromChain || $calledFromChain ne "ACC");
}
my ($fn, $param) = split("[ \t][ \t]*", $cmd, 2);
return undef if(!$fn);
@ -1685,8 +1690,10 @@ ReplaceSetMagic($$@) # Forum #38276
$a =~s/(\[([ari]:)?([a-zA-Z\d._]+):([a-zA-Z\d._\/-]+)(:(t|sec|i|d|r|r\d))?\])/
rsmVal($1,$2,$3,$4,$5)/eg;
my $esDef = ($evalSpecials ? 1 : 0);
$evalSpecials->{'%DEV'} = $hash->{NAME};
$a =~ s/{\((.*?)\)}/AnalyzePerlCommand($hash->{CL},$1,1)/egs;
$evalSpecials = undef if(!$esDef);;
return (undef, @_) if($oa eq $a);
return (undef, split(/ /, $a, $nsplit));