flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

cFile:ChangeFileExt now accepts extensions with leading dot, too.

Browse Source
This commit is contained in:
Mattes D
2015-04-11 17:42:32 +02:00
parent c4842cb9aa
commit 79e8f8fb20
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/OSSupport/File.cpp
View File

@@ -481,13 +481,25 @@ AString cFile::ChangeFileExt(const AString & a_FileName, const AString & a_NewEx
)
{
// No extension, just append the new one:
res.push_back('.');
if (!a_NewExt.empty() && (a_NewExt[0] != '.'))
{
// a_NewExt doesn't start with a dot, insert one:
res.push_back('.');
}
res.append(a_NewExt);
}
else
{
// Replace existing extension:
res.erase(DotPos + 1, AString::npos);
if (!a_NewExt.empty() && (a_NewExt[0] != '.'))
{
// a_NewExt doesn't start with a dot, keep the current one:
res.erase(DotPos + 1, AString::npos);
}
else
{
res.erase(DotPos, AString::npos);
}
res.append(a_NewExt);
}
return res;