tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2007-08-24 Esteban Sanchez <estebans@artica.es> 

* win32/windows/pandora_wmi.cc: Fixed a bug when reading free space
        from a read-only device such as CD-ROM by improving the WQL query.

        * bin/PandoraAgent.exe: Updated to last commit.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@617 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
esanchezm 2007-08-24 11:48:23 +00:00
parent 49ad568061
commit bc3799534c
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_agents/win32/ChangeLog
View File

@ -1,3 +1,10 @@
2007-08-24 Esteban Sanchez <estebans@artica.es>
* win32/windows/pandora_wmi.cc: Fixed a bug when reading free space
from a read-only device such as CD-ROM by improving the WQL query.
* bin/PandoraAgent.exe: Updated to last commit.
2007-08-23 Sancho Lerena <slerena@artica.es>
* bin/pandora_agent.conf: More comple sample config.

BIN
pandora_agents/win32/bin/PandoraAgent.exe
View File

Binary file not shown.

38
pandora_agents/win32/windows/pandora_wmi.cc
View File

@ -159,40 +159,22 @@ Pandora_Wmi::getDiskFreeSpace (string disk_id) {
CDispPtr wmi_svc, quickfixes;
string id, space_str;
unsigned long long space = 0;
string query;
struct QFix {
CDhStringA id, free_space;
};
query = "SELECT DeviceID, FreeSpace FROM Win32_LogicalDisk WHERE DeviceID = \"" + disk_id + "\"";
try {
dhCheck (dhGetObject (getWmiStr (L"."), NULL, &wmi_svc));
dhCheck (dhGetValue (L"%o", &quickfixes, wmi_svc,
L".ExecQuery(%S)",
L"SELECT DeviceID, FreeSpace FROM Win32_LogicalDisk "));
L".ExecQuery(%T)",
query.c_str ()));
FOR_EACH (quickfix, quickfixes, NULL) {
QFix fix = { 0 };
dhGetValue (L"%s", &fix.id, quickfix,
L".DeviceID");
id = fix.id;
if (disk_id == id) {
dhGetValue (L"%s", &fix.free_space, quickfix,
L".FreeSpace");
space_str = fix.free_space;
try {
space = Pandora_Strutils::strtoulong (space_str);
} catch (Pandora_Exception e) {
throw Pandora_Wmi_Exception ();
}
return space / 1024 / 1024;
}
dhGetValue (L"%d", &space, quickfix,
L".FreeSpace");
cout << space << endl;
return space / 1024 / 1024;
} NEXT_THROW (quickfix);
} catch (string errstr) {
pandoraLog ("getDiskFreeSpace error. %s", errstr.c_str ());