Changeset e4d3f23 in nscp for modules/CheckSystem

Timestamp:

06/23/07 10:44:30 (6 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

e6e297e

Parents:

6c5375b

Message:

Fixed problem with missing \0 on ns-client streams (but I am doubtfull that it will "work" better it will simply not crash any longer, nsclient has to be \n terminated...

File:

• modules/CheckSystem/CheckSystem.cpp (modified) (3 diffs)

modules/CheckSystem/CheckSystem.cpp

@@ -125 +125 @@
 int CheckSystem::commandLineExec(const char* command,const unsigned int argLen,char** args) {
   if (_stricmp(command, "debugpdh") == 0) {
-    PDH::Enumerations::Objects lst = PDH::Enumerations::EnumObjects();
+    PDH::Enumerations::Objects lst;
+    try {
+      lst = PDH::Enumerations::EnumObjects();
+    } catch (const PDH::PDHException e) {
+      std::cout << "Service enumeration failed: " << e.getError();
+      return 0;
+    }
     for (PDH::Enumerations::Objects::iterator it = lst.begin();it!=lst.end();++it) {
       if ((*it).instances.size() > 0) {
@@ -238 +244 @@
     }
   } else if (_stricmp(command, "listpdh") == 0) {
-    PDH::Enumerations::Objects lst = PDH::Enumerations::EnumObjects();
+    PDH::Enumerations::Objects lst;
+    try {
+      lst = PDH::Enumerations::EnumObjects();
+    } catch (const PDH::PDHException e) {
+      std::cout << "Service enumeration failed: " << e.getError();
+      return 0;
+    }
     for (PDH::Enumerations::Objects::iterator it = lst.begin();it!=lst.end();++it) {
       if ((*it).instances.size() > 0) {
@@ -591 +603 @@
     MAP_OPTIONS_STR_AND("type", tmpObject.data, list.push_back(tmpObject))
     MAP_OPTIONS_STR_AND("Type", tmpObject.data, list.push_back(tmpObject))
-    MAP_OPTIONS_DISK_ALL(tmpObject, "", "Free", "Used")
-    MAP_OPTIONS_STR("Alias", tmpObject.data)
-    MAP_OPTIONS_SHOWALL(tmpObject)
-    MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
-    MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
     MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
       MAP_OPTIONS_SECONDARY_STR_AND(p2,"type", tmpObject.data, tmpObject.alias, list.push_back(tmpObject))
       MAP_OPTIONS_MISSING_EX(p2, msg, "Unknown argument: ")
     MAP_OPTIONS_SECONDARY_END()
+    MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
+    MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
+
+    MAP_OPTIONS_USELESS_IF_LAST(stl_args)
+    MAP_OPTIONS_DISK_ALL(tmpObject, "", "Free", "Used")
+    MAP_OPTIONS_STR("Alias", tmpObject.data)
+    MAP_OPTIONS_SHOWALL(tmpObject)
     MAP_OPTIONS_MISSING(msg, "Unknown argument: ")
   MAP_OPTIONS_END()
+
+  
   if (bNSClient) {
     tmpObject.data = "paged";