FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-23 20:52:13 +00:00
Code Issues Releases Wiki Activity

10_CUL_HM: allow windows line termination

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6794 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-10-19 16:48:14 +00:00
parent d53f809f50
commit 234dce12a9
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/FHEM/10_CUL_HM.pm
View File

@ -7218,6 +7218,7 @@ sub CUL_HM_tempListTmpl(@) { ##################################################
while(<aSave>){
chomp;
my $line = $_;
$line =~ s/\r//g;
next if($line =~ m/#/);
if($line =~ m/^entities:/){
last if ($found != 0);

4
fhem/FHEM/98_HMinfo.pm
View File

@ -617,6 +617,7 @@ sub HMinfo_tempList(@) { ######################################################
while(<aRead>){
chomp;
my $line = $_;
$line =~ s/\r//g;
if ($line =~ m/entities:(.*)/){
my $eFound = $1;
if (grep /\b$eFound\b/,@chList){
@ -1409,6 +1410,7 @@ sub HMinfo_verifyConfig($@) {##################################################
while(<aSave>){
chomp;
my $line = $_;
$line =~ s/\r//g;
next if ( $line !~ m/set .* (peerBulk|regBulk) .*/);
my ($cmd1,$eN,$cmd,$param) = split(" ",$line,4);
next if ($eN !~ m/$filter/);
@ -1506,6 +1508,7 @@ sub HMinfo_loadConfig($@) {####################################################
while(<aSave>){
chomp;
my $line = $_;
$line =~ s/\r//g;
next if ( $line !~ m/set .* (peerBulk|regBulk) .*/
&& $line !~ m/setreading .*/);
my ($cmd1,$eN,$cmd,$param) = split(" ",$line,4);
@ -1581,6 +1584,7 @@ sub HMinfo_purgeConfig($) {####################################################
while(<aSave>){
chomp;
my $line = $_;
$line =~ s/\r//g;
next if ( $line !~ m/set (.*) (peerBulk|regBulk) (.*)/
&& $line !~ m/setreading .*/);
my ($cmd,$eN,$typ,$p1,$p2) = split(" ",$line,5);