X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwin32%2Fcompat%2Fcompat.cpp;h=d5931f439254f717d11449ff39accd88c2b01ecf;hb=6c210279bc094ec7bfedf140e515ed98eb2734a3;hp=b9067875f6df4be235a482766faaade839143a4c;hpb=7e20a09cf85a90f97530c14e6604839ed727c74b;p=bacula%2Fbacula diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp index b9067875f6..d5931f4392 100644 --- a/bacula/src/win32/compat/compat.cpp +++ b/bacula/src/win32/compat/compat.cpp @@ -253,7 +253,7 @@ make_wchar_win32_path(POOLMEM *pszUCSPath, BOOL *pBIsRawPath /*= NULL*/) if (bAddDrive && !bAddCurrentPath) { wchar_t szDrive[3]; - if (!bAddPrefix && dwCurDirPathSize > 3 && wcsncmp((LPCWSTR)pwszCurDirBuf, L"\\\\?\\", 4) == 0) { + if (dwCurDirPathSize > 3 && wcsncmp((LPCWSTR)pwszCurDirBuf, L"\\\\?\\", 4) == 0) { /* copy drive character */ wcsncpy((wchar_t *)szDrive, (LPCWSTR)pwszCurDirBuf+4, 2); } else { @@ -328,9 +328,9 @@ make_wchar_win32_path(POOLMEM *pszUCSPath, BOOL *pBIsRawPath /*= NULL*/) /* create temp. buffer */ POOLMEM* pszBuf = get_pool_memory(PM_FNAME); pszBuf = check_pool_memory_size(pszBuf, (dwBufCharsNeeded+MAX_PATH)*sizeof(wchar_t)); -// if (bAddPrefix) -// nParseOffset = 4; -// else + if (bAddPrefix) + nParseOffset = 4; + else nParseOffset = 0; wcsncpy((wchar_t *)pszBuf, (wchar_t *)pwszBuf+nParseOffset, wcslen((wchar_t *)pwszBuf)+1-nParseOffset); g_pVSSPathConvertW((wchar_t *)pszBuf, (wchar_t *)pwszBuf, dwBufCharsNeeded+MAX_PATH);