FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 07:24:21 +00:00
Code Issues Releases Wiki Activity

FRITZBOX: Handles error: No STDOUT from shell command

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7904 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2015-02-07 16:50:34 +00:00
parent 401a14017b
commit 4c40644f9b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/72_FRITZBOX.pm
View File

@ -788,6 +788,7 @@ sub FRITZBOX_Readout_Run($)
for (1..$fonCount)
{
push @readoutCmdArray, ["fon".$_, "ctlmgr_ctl r telcfg settings/MSN/Port".($_-1)."/Name" ];
push @readoutCmdArray, ["fon".$_."_out", "ctlmgr_ctl r telcfg settings/MSN/Port".($_-1)."/MSN" ];
}
$resultArray = FRITZBOX_Readout_Query( $hash, \@readoutCmdArray, \@readoutReadings );
@ -795,7 +796,7 @@ sub FRITZBOX_Readout_Run($)
for (1..$fonCount)
{
push @readoutReadings, "fon".$_."_intern|".$_
if $resultArray->[$_-1];
if $resultArray->[($_-1)*2];
}
# Prepare new command array
@ -2284,8 +2285,8 @@ FRITZBOX_Exec_Remote($$)
}
# Executed the command on the FritzBox Shell
sub ############################################
FRITZBOX_Exec_Local($$)
############################################
sub FRITZBOX_Exec_Local($$)
{
my ($hash, $cmd) = @_;
@ -2307,6 +2308,11 @@ FRITZBOX_Exec_Local($$)
my $cmdStr = join "\necho ' |#|'\n", @{$cmd};
$cmdStr .= "\necho ' |#|'";
my $result = qx($cmdStr);
unless (defined $result)
{
FRITZBOX_Log $hash, 1, "Error: No STDOUT from shell command.";
return undef;
}
$result =~ s/\n|\r//g;
my @resultArray = split /\|#\|/, $result;
foreach (keys @resultArray)