From a566de8c24a76b60c829d7af6577e26e40b9f5a9 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sun, 19 Oct 2014 16:48:14 +0000 Subject: [PATCH] 10_CUL_HM: allow windows line termination git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@6794 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/10_CUL_HM.pm | 1 + FHEM/98_HMinfo.pm | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/FHEM/10_CUL_HM.pm b/FHEM/10_CUL_HM.pm index a653842df..674bd5845 100755 --- a/FHEM/10_CUL_HM.pm +++ b/FHEM/10_CUL_HM.pm @@ -7218,6 +7218,7 @@ sub CUL_HM_tempListTmpl(@) { ################################################## while(){ chomp; my $line = $_; + $line =~ s/\r//g; next if($line =~ m/#/); if($line =~ m/^entities:/){ last if ($found != 0); diff --git a/FHEM/98_HMinfo.pm b/FHEM/98_HMinfo.pm index 949bbf95e..2e2a0d573 100644 --- a/FHEM/98_HMinfo.pm +++ b/FHEM/98_HMinfo.pm @@ -617,6 +617,7 @@ sub HMinfo_tempList(@) { ###################################################### while(){ 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(){ 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(){ 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(){ 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);