mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-10 09:16:53 +00:00
fhem.pl: unicodeEncoding in FileRead/FileWrite (Forum #126088)
git-svn-id: https://svn.fhem.de/fhem/trunk@25680 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
6ab9290eca
commit
fbc5423a99
19
fhem/fhem.pl
19
fhem/fhem.pl
@ -5679,13 +5679,16 @@ FileRead($)
|
|||||||
($err, @ret) = cfgDB_FileRead($fileName);
|
($err, @ret) = cfgDB_FileRead($fileName);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if(open(FH, $fileName)) {
|
my $FH;
|
||||||
@ret = <FH>;
|
if(open($FH, $fileName)) {
|
||||||
close(FH);
|
binmode($FH, ":encoding(UTF-8)") if($unicodeEncoding);
|
||||||
|
@ret = <$FH>;
|
||||||
|
close($FH);
|
||||||
chomp(@ret);
|
chomp(@ret);
|
||||||
} else {
|
} else {
|
||||||
$err = "Can't open $fileName: $!";
|
$err = "Can't open $fileName: $!";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ($err, @ret);
|
return ($err, @ret);
|
||||||
@ -5711,12 +5714,14 @@ FileWrite($@)
|
|||||||
return cfgDB_FileWrite($fileName, @rows);
|
return cfgDB_FileWrite($fileName, @rows);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if(open(FH, ">$fileName")) {
|
my $FH;
|
||||||
binmode (FH);
|
if(open($FH, ">$fileName")) {
|
||||||
|
binmode($FH);
|
||||||
|
binmode($FH, ":encoding(UTF-8)") if($unicodeEncoding);
|
||||||
foreach my $l (@rows) {
|
foreach my $l (@rows) {
|
||||||
print FH $l,$nl;
|
print $FH $l,$nl;
|
||||||
}
|
}
|
||||||
close(FH);
|
close($FH);
|
||||||
return undef;
|
return undef;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user