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

9.21

Browse Source
This commit is contained in:
Igor Pavlov
2011-04-11 00:00:00 +00:00
committed by Kornel Lesiński
parent de4f8c22fe
commit 35596517f2
322 changed files with 9989 additions and 7759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CPP/7zip/Common/FilePathAutoRename.cpp
View File

@@ -11,10 +11,10 @@
using namespace NWindows;
static bool MakeAutoName(const UString &name,
const UString &extension, unsigned value, UString &path)
static bool MakeAutoName(const FString &name,
const FString &extension, unsigned value, FString &path)
{
wchar_t number[16];
FChar number[16];
ConvertUInt32ToString(value, number);
path = name;
path += number;
@@ -22,18 +22,18 @@ static bool MakeAutoName(const UString &name,
return NFile::NFind::DoesFileOrDirExist(path);
}
bool AutoRenamePath(UString &fullProcessedPath)
bool AutoRenamePath(FString &fullProcessedPath)
{
UString path;
int dotPos = fullProcessedPath.ReverseFind(L'.');
FString path;
int dotPos = fullProcessedPath.ReverseFind(FTEXT('.'));
int slashPos = fullProcessedPath.ReverseFind(L'/');
int slashPos = fullProcessedPath.ReverseFind(FTEXT('/'));
#ifdef _WIN32
int slash1Pos = fullProcessedPath.ReverseFind(L'\\');
int slash1Pos = fullProcessedPath.ReverseFind(FTEXT('\\'));
slashPos = MyMax(slashPos, slash1Pos);
#endif
UString name, extension;
FString name, extension;
if (dotPos > slashPos && dotPos > 0)
{
name = fullProcessedPath.Left(dotPos);