Changeset 4580c6c in nscp

Timestamp:

07/08/09 21:23:39 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

79f8b2c

Parents:

dcd5462

Message:

2009-07-05 MickeM

• Fixed issue with CheckExternalScripts and script_dir: not adding the commands properly.
• Fixed issue with CheckExternalScripts and script_dir: not using relative paths (#310).

2009-06-20 MickeM

• Fixed issue with CheckDisk and paths not working out properly

as well as some missing files for the build to work properly

Files:

• AutoBuild.h (modified) (1 diff)
• changelog (modified) (1 diff)
• helpers/installer_dll/Jamfile (added)
• helpers/installer_dll/installer_dll.vcproj (added)
• helpers/installer_dll/installer_helper.hpp (added)
• helpers/installer_dll/main_dll.cpp (added)
• helpers/installer_dll/main_dll.def (added)
• helpers/systray_helper/Jamfile (added)
• modules/CheckDisk/CheckDisk.cpp (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (1 diff)
• modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj (modified) (1 diff)
• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (2 diffs)
• modules/CheckExternalScripts/CheckExternalScripts.h (modified) (1 diff)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,7,4
-#define PRODUCTVER     0,3,7,4
-#define STRFILEVER     _T("0.3.7.4")
-#define STRPRODUCTVER  _T("0.3.7.4")
-#define STRPRODUCTDATE  _T("2009-06-20")
+#define FILEVER        0,3,7,8
+#define PRODUCTVER     0,3,7,8
+#define STRFILEVER     _T("0.3.7.8")
+#define STRPRODUCTVER  _T("0.3.7.8")
+#define STRPRODUCTDATE  _T("2009-07-05")
 #endif // AUTOBUILD_H

changelog

@@ -6 +6 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2009-07-05 MickeM
+ * Fixed issue with CheckExternalScripts and script_dir: not adding the commands properly.
+ * Fixed issue with CheckExternalScripts and script_dir: not using relative paths (#310).
 
 2009-06-20 MickeM

modules/CheckDisk/CheckDisk.cpp

@@ -833 +833 @@
     NSC_error errors;
     for (std::list<std::wstring>::const_iterator pit = paths.begin(); pit != paths.end(); ++pit) {
-      //pattern_type path = split_path(*pit);
       recursive_scan<file_filter_function_ex>(*pit, pattern, 0, max_dir_depth, finder, &errors);
       if (finder.hasError()) {

modules/CheckEventLog/CheckEventLog.cpp

@@ -182 +182 @@
         strEx::replace(real_name, _T("\n"), _T(""));
         strEx::replace(real_name, _T("\r"), _T(""));
+        NSC_DEBUG_MSG(_T("Attempting to match: ") + real_name + _T(" with ") + name);
         if (real_name == name)
           return *cit;

modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj

@@ -2044 +2044 @@
       </File>
       <File
+        RelativePath="..\..\include\file_helpers.hpp"
+        >
+      </File>
+      <File
         RelativePath="..\..\include\NSCHelper.h"
         >

modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -25 +25 @@
 #include <config.h>
 #include <msvc_wrappers.h>
+#include <file_helpers.hpp>
 
 CheckExternalScripts gCheckExternalScripts;
@@ -38 +39 @@
 
 void CheckExternalScripts::addAllScriptsFrom(std::wstring path) {
-  std::wstring baseDir;
+  file_helpers::patterns::pattern_type pattern = file_helpers::patterns::split_pattern(path);
+  if (!file_helpers::checks::exists(pattern.first)) 
+    pattern.first = NSCModuleHelper::getBasePath() + _T("\\") + pattern.first;
+  if (!file_helpers::checks::exists(pattern.first))
+    NSC_LOG_ERROR_STD(_T("Path was not found: ") + pattern.first);
+/* TODO: do we need this?
   std::wstring::size_type pos = path.find_last_of('*');
   if (pos == std::wstring::npos) {
     path += _T("*.*");
   }
+  */
   WIN32_FIND_DATA wfd;
-  HANDLE hFind = FindFirstFile(path.c_str(), &wfd);
+  std::wstring real_path = file_helpers::patterns::combine_pattern(pattern);
+  HANDLE hFind = FindFirstFile(real_path.c_str(), &wfd);
   if (hFind != INVALID_HANDLE_VALUE) {
     do {
       if ((wfd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) {
-        addCommand(wfd.cFileName);
+        addCommand(wfd.cFileName, pattern.first + _T("\\") + wfd.cFileName, _T(""));
       }
     } while (FindNextFile(hFind, &wfd));
   } else {
-    NSC_LOG_ERROR_STD(_T("No scripts found in path: ") + path);
+    NSC_LOG_ERROR_STD(_T("No scripts found in path: ") + real_path);
     return;
   }

modules/CheckExternalScripts/CheckExternalScripts.h

@@ -79 +79 @@
 private:
   void addAllScriptsFrom(std::wstring path);
-  void addCommand(strEx::blindstr key, std::wstring cmd = _T(""), std::wstring args = _T("")) {
+  void addCommand(strEx::blindstr key, std::wstring cmd, std::wstring args) {
     commands[key] = command_data(cmd, args);
   }
-  void addAlias(strEx::blindstr key, std::wstring cmd = _T(""), std::wstring args = _T("")) {
+  void addAlias(strEx::blindstr key, std::wstring cmd, std::wstring args) {
     alias[key] = command_data(cmd, args);
   }