mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-03 16:56:54 +00:00
Fixes for windows
git-svn-id: https://svn.fhem.de/fhem/trunk@422 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
e180de03d8
commit
ad52c1cf86
@ -835,6 +835,7 @@ FW_readgplotfile($$$)
|
|||||||
my (@filelog, @data, $plot);
|
my (@filelog, @data, $plot);
|
||||||
open(FH, $gplot_pgm) || return (FW_fatal("$gplot_pgm: $!"), undef);
|
open(FH, $gplot_pgm) || return (FW_fatal("$gplot_pgm: $!"), undef);
|
||||||
while(my $l = <FH>) {
|
while(my $l = <FH>) {
|
||||||
|
$l =~ s/\r//g;
|
||||||
if($l =~ m/^#FileLog (.*)$/) {
|
if($l =~ m/^#FileLog (.*)$/) {
|
||||||
push(@filelog, $1);
|
push(@filelog, $1);
|
||||||
} elsif($l =~ "^plot" || $plot) {
|
} elsif($l =~ "^plot" || $plot) {
|
||||||
@ -888,6 +889,9 @@ FW_substcfg($$$$$$)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$plot =~ s/\r//g; # For our windows friends...
|
||||||
|
$gplot_script =~ s/\r//g;
|
||||||
|
|
||||||
if($splitret == 1) {
|
if($splitret == 1) {
|
||||||
my @ret = split("\n", $gplot_script);
|
my @ret = split("\n", $gplot_script);
|
||||||
return (\@ret, $plot);
|
return (\@ret, $plot);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user