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

Windows bugfixes for Utility::DirName and Utility::Glob.

This commit is contained in:
Gunnar Beutner 2013-02-09 10:43:11 +01:00
parent 06999e40e9
commit 85e469019f
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/base/utility.cpp
View File

@ -267,12 +267,27 @@ bool Utility::Match(const String& pattern, const String& text)
*/ */
String Utility::DirName(const String& path) String Utility::DirName(const String& path)
{ {
char *dir = strdup(path.CStr()); char *dir;
String result;
#ifdef _WIN32
String dupPath = path;
/* PathRemoveFileSpec doesn't properly handle forward slashes. */
BOOST_FOREACH(char& ch, dupPath) {
if (ch == '/')
ch = '\\';
}
dir = strdup(dupPath.CStr());
#else /* _WIN32 */
dir = strdup(path.CStr());
#endif /* _WIN32 */
if (dir == NULL) if (dir == NULL)
BOOST_THROW_EXCEPTION(bad_alloc()); BOOST_THROW_EXCEPTION(bad_alloc());
String result;
#ifndef _WIN32 #ifndef _WIN32
result = dirname(dir); result = dirname(dir);
#else /* _WIN32 */ #else /* _WIN32 */
@ -464,7 +479,7 @@ bool Utility::Glob(const String& pathSpec, const function<void (const String&)>&
} }
do { do {
callback(wfd.cFileName); callback(DirName(pathSpec) + "/" + wfd.cFileName);
} while (FindNextFile(handle, &wfd)); } while (FindNextFile(handle, &wfd));
if (!FindClose(handle)) if (!FindClose(handle))