xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-08 02:07:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

9.19

Browse Source
This commit is contained in:
Igor Pavlov
2010-11-11 00:00:00 +00:00
committed by Kornel Lesiński
parent c65230d858
commit b75af1bba6
25 changed files with 314 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
CPP/Windows/FileDir.cpp
View File

@@ -474,7 +474,7 @@ bool MyGetFullPathName(LPCWSTR fileName, UString &resultPath, int &fileNamePartS
{
resultPath = fileName;
// change it
fileNamePartStartIndex = resultPath.ReverseFind('\\');
fileNamePartStartIndex = resultPath.ReverseFind(WCHAR_PATH_SEPARATOR);
fileNamePartStartIndex++;
return true;
}
@@ -488,6 +488,38 @@ bool MyGetShortPathName(LPCTSTR longPath, CSysString &shortPath)
return (needLength > 0 && needLength < MAX_PATH);
}
#ifdef WIN_LONG_PATH
static UString GetLastPart(LPCWSTR path)
{
int i = (int)wcslen(path);
for (; i > 0; i--)
{
WCHAR c = path[i - 1];
if (c == WCHAR_PATH_SEPARATOR || c == '/')
break;
}
return path + i;
}
static void AddTrailingDots(LPCWSTR oldPath, UString &newPath)
{
int len = (int)wcslen(oldPath);
int i;
for (i = len; i > 0 && oldPath[i - 1] == '.'; i--);
if (i == 0 || i == len)
return;
UString oldName = GetLastPart(oldPath);
UString newName = GetLastPart(newPath);
int nonDotsLen = oldName.Length() - (len - i);
if (nonDotsLen == 0 || newName.CompareNoCase(oldName.Left(nonDotsLen)) != 0)
return;
for (; i != len; i++)
newPath += '.';
}
#endif
bool MyGetFullPathName(LPCTSTR fileName, CSysString &resultPath, int &fileNamePartStartIndex)
{
resultPath.Empty();
@@ -512,6 +544,11 @@ bool MyGetFullPathName(LPCTSTR fileName, CSysString &resultPath, int &fileNamePa
fileNamePartStartIndex = lstrlen(fileName);
else
fileNamePartStartIndex = (int)(fileNamePointer - buffer);
#ifdef _UNICODE
#ifdef WIN_LONG_PATH
AddTrailingDots(fileName, resultPath);
#endif
#endif
return true;
}
@@ -542,6 +579,9 @@ bool MyGetFullPathName(LPCWSTR fileName, UString &resultPath, int &fileNamePartS
fileNamePartStartIndex = MyStringLen(fileName);
else
fileNamePartStartIndex = (int)(fileNamePointer - buffer);
#ifdef WIN_LONG_PATH
AddTrailingDots(fileName, resultPath);
#endif
}
else
{