FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

Fix: uninitialized variables, filesystems bug for root (/)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4687 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hexenmeister 2014-01-18 23:37:57 +00:00
parent f46900ce73
commit ec6aca7b0f
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fhem/FHEM/42_SYSMON.pm
View File

@ -23,7 +23,7 @@
#
################################################################
# $Id: 42_SYSMON.pm 4644 2014-01-14 18:57:03Z hexenmeister $
# $Id$
package main;
@ -814,6 +814,8 @@ sub SYSMON_getFileSystemInfo ($$$)
{
my ($hash, $map, $fs) = @_;
logF($hash, "SYSMON_getFileSystemInfo", "get $fs");
# Neue Syntax: benannte Filesystems: <name>:<definition>
my($fName, $fDef, $fComment) = split(/:/, $fs);
if(defined $fDef) {
@ -822,14 +824,32 @@ sub SYSMON_getFileSystemInfo ($$$)
#my $disk = "df ".$fs." -m 2>&1"; # in case of failure get string from stderr
my $disk = "df ".$fs." -m";
logF($hash, "SYSMON_getFileSystemInfo", "exec $disk");
#my @filesystems = qx($disk);
my @filesystems = SYSMON_execute($hash, $disk);
logF($hash, "SYSMON_getFileSystemInfo", "recieved ".scalar(scalar(@filesystems))." lines");
if(!defined @filesystems) { return $map; } # Ausgabe leer
if(scalar(@filesystems) == 0) { return $map; } # Array leer
logF($hash, "SYSMON_getFileSystemInfo", "recieved line0 $filesystems[0]");
shift @filesystems;
if (index($filesystems[0], $fs) < 0) { shift @filesystems; } # Wenn die Bezeichnung so lang ist, dass die Zeile umgebrochen wird...
if (index($filesystems[0], $fs) >= 0) # check if filesystem available -> gives failure on console
if(!defined $filesystems[0]) { return $map; } # Ausgabe leer
logF($hash, "SYSMON_getFileSystemInfo", "analyse line $filesystems[0]");
if (!$filesystems[0]=~ /$fs\s*$/){ shift @filesystems; }
#if (index($filesystems[0], $fs) < 0) { shift @filesystems; } # Wenn die Bezeichnung so lang ist, dass die Zeile umgebrochen wird...
#if (index($filesystems[0], $fs) >= 0) # check if filesystem available -> gives failure on console
if ($filesystems[0]=~ /$fs\s*$/)
{
logF($hash, "SYSMON_getFileSystemInfo", "use line $filesystems[0]");
my ($fs_desc, $total, $used, $available, $percentage_used, $mnt_point) = split(/\s+/, $filesystems[0]);
$percentage_used =~ /^(.+)%$/;
$percentage_used = $1;
@ -989,6 +1009,7 @@ log 3, "SYSMON $>name, @data<";
# Datum anzeigen
$rVal = strftime("%d.%m.%Y %H:%M:%S", localtime());
}
if(!defined $rPostfix) { $rPostfix = ""; }
if(defined $rVal) {
$htmlcode .= "<tr><td valign='top'>".$rComment.":&nbsp;</td><td>".$rVal.$rPostfix."</td></tr>";
}