dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix e53998ec0: Incorrect handling of changed path separators in strgen

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-06-10 19:40:08 +01:00
parent 162015433e
commit 81ba704477
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/strgen/strgen.cpp
View File

@@ -628,8 +628,6 @@ int CDECL main(int argc, char *argv[])
writer.Finalise(data); writer.Finalise(data);
if (_errors != 0) return 1; if (_errors != 0) return 1;
} else { } else {
char *r;
mkpath(pathbuf, lastof(pathbuf), src_dir.c_str(), "english.txt"); mkpath(pathbuf, lastof(pathbuf), src_dir.c_str(), "english.txt");
mkpath2(pathbuf2, lastof(pathbuf2), src_dir.c_str(), "extra", "english.txt"); mkpath2(pathbuf2, lastof(pathbuf2), src_dir.c_str(), "extra", "english.txt");
@@ -641,7 +639,7 @@ int CDECL main(int argc, char *argv[])
for (auto &argument : mgo.arguments) { for (auto &argument : mgo.arguments) {
data.FreeTranslation(); data.FreeTranslation();
std::string translation = replace_pathsep(argument); const std::string translation = replace_pathsep(argument);
const char *file = strrchr(translation.c_str(), PATHSEPCHAR); const char *file = strrchr(translation.c_str(), PATHSEPCHAR);
const char *translation2 = nullptr; const char *translation2 = nullptr;
if (file != nullptr) { if (file != nullptr) {
@@ -653,11 +651,10 @@ int CDECL main(int argc, char *argv[])
if (_errors != 0) return 1; if (_errors != 0) return 1;
/* get the targetfile, strip any directories and append to destination path */ /* get the targetfile, strip any directories and append to destination path */
r = strrchr(argument, PATHSEPCHAR); mkpath(pathbuf, lastof(pathbuf), dest_dir.c_str(), (file != nullptr) ? file + 1 : translation.c_str());
mkpath(pathbuf, lastof(pathbuf), dest_dir.c_str(), (r != nullptr) ? &r[1] : argument);
/* rename the .txt (input-extension) to .lng */ /* rename the .txt (input-extension) to .lng */
r = strrchr(pathbuf, '.'); char *r = strrchr(pathbuf, '.');
if (r == nullptr || strcmp(r, ".txt") != 0) r = strchr(pathbuf, '\0'); if (r == nullptr || strcmp(r, ".txt") != 0) r = strchr(pathbuf, '\0');
strecpy(r, ".lng", lastof(pathbuf)); strecpy(r, ".lng", lastof(pathbuf));