FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 23:06:37 +00:00
Code Issues Releases Wiki Activity

57_Calendar: fix for splitting at line endings that clashes with Unicode

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14333 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2017-05-20 16:18:41 +00:00
parent e20de349cf
commit 149bbb8dd7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/57_Calendar.pm
View File

@ -882,7 +882,7 @@ sub addproperty($$) {
return;
}
return unless($key);
#main::Debug "addproperty for key $key";
#main::Debug "addproperty for line $line gives key $key, parts is $parts, parameter os $parameter";
# ignore some properties
# commented out: it is faster to add the property than to do the check
@ -913,7 +913,13 @@ sub addproperty($$) {
sub parse($$) {
my ($self,$ics)= @_;
my @ical= split /\R/, $ics;
# This is the proper way to do it, with \R corresponding to (?>\r\n|\n|\x0b|\f|\r|\x85|\x2028|\x2029)
# my @ical= split /\R/, $ics;
# Tt does not treat some unicode emojis correctly, though.
# We thus go for the the DOS/Windows/Unix/Mac classic variants.
# Suggested reading:
# http://stackoverflow.com/questions/3219014/what-is-a-cross-platform-regex-for-removal-of-line-breaks
my @ical= split /(?>\r\n|[\r\n])/, $ics;
return $self->parseSub(0, \@ical);
}
@ -924,6 +930,7 @@ sub parseSub($$$) {
#main::Debug "ENTER @ $ln";
while($ln< $len) {
my $line= $$icalref[$ln];
main::Debug "parse line $line";
$ln++;
# check for and handle continuation lines (4.1 on page 12)
while($ln< $len) {