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

Fix MkDirP() on Windows 

fixes #10231
This commit is contained in:
Michael Friedrich 2016-03-03 15:54:35 +01:00
parent 47521904c1
commit d14477c242
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/utility.cpp
View File

@ -702,11 +702,13 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo
void Utility::MkDir(const String& path, int mode) void Utility::MkDir(const String& path, int mode)
{ {
#ifndef _WIN32 #ifndef _WIN32
if (mkdir(path.CStr(), mode) < 0 && errno != EEXIST) { if (mkdir(path.CStr(), mode) < 0 && errno != EEXIST) {
#else /*_ WIN32 */ #else /*_ WIN32 */
if (mkdir(path.CStr()) < 0 && errno != EEXIST) { if (mkdir(path.CStr()) < 0 && errno != EEXIST) {
#endif /* _WIN32 */ #endif /* _WIN32 */
BOOST_THROW_EXCEPTION(posix_error() BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("mkdir") << boost::errinfo_api_function("mkdir")
<< boost::errinfo_errno(errno) << boost::errinfo_errno(errno)
@ -719,7 +721,11 @@ void Utility::MkDirP(const String& path, int mode)
size_t pos = 0; size_t pos = 0;
while (pos != String::NPos) { while (pos != String::NPos) {
#ifndef _WIN32
pos = path.Find("/", pos + 1); pos = path.Find("/", pos + 1);
#else /*_ WIN32 */
pos = path.Find("\\", pos + 1);
#endif /* _WIN32 */
MkDir(path.SubStr(0, pos), mode); MkDir(path.SubStr(0, pos), mode);
} }
} }