diff options
| -rwxr-xr-x | inc/InstallerDefs.h | 2 | ||||
| -rwxr-xr-x | src/Util/InstallerUtil.cpp | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h index 21e59c6..775be08 100755 --- a/inc/InstallerDefs.h +++ b/inc/InstallerDefs.h @@ -23,7 +23,7 @@ #include "InstallerUtil.h" -#define OSP_INSTALLER_VERSION "version=[20130214.1]" +#define OSP_INSTALLER_VERSION "version=[20130221.1]" #define DIR_BIN L"/bin" #define DIR_INFO L"/info" diff --git a/src/Util/InstallerUtil.cpp b/src/Util/InstallerUtil.cpp index d473130..7cd5bf0 100755 --- a/src/Util/InstallerUtil.cpp +++ b/src/Util/InstallerUtil.cpp @@ -210,8 +210,6 @@ InstallerUtil::GetRealPath(const String& filePath, String& realPath) { char* pRealPath = null; - AppLog("GetRealPath(): path=[%ls], realPath=[%ls]", filePath.GetPointer(), realPath.GetPointer()); - std::unique_ptr<char[]> pFilePath(_StringConverter::CopyToCharArrayN(filePath)); TryReturn(pFilePath, false, "pFilePath is null"); @@ -221,6 +219,8 @@ InstallerUtil::GetRealPath(const String& filePath, String& realPath) realPath = tmpPath; + AppLog("GetRealPath(): path=[%ls], realPath=[%ls]", filePath.GetPointer(), realPath.GetPointer()); + return true; } @@ -304,8 +304,13 @@ InstallerUtil::ChangeDirectoryPermission(const String& filePath, int mode, bool while (pDirEnum->MoveNext() == E_SUCCESS) { DirEntry entry = pDirEnum->GetCurrentDirEntry(); - String entryName = entry.GetName(); + if (entryName.IsEmpty() == true) + { + AppLog("entryName is empty.", entryName.GetPointer()); + continue; + } + String entryDir = filePath; entryDir += L"/"; entryDir += entryName; |