Files
@ r28396:ef195b601c72
Branch filter:
Location: cpp/openttd-patchpack/source/src/ini.cpp - annotation
r28396:ef195b601c72
4.3 KiB
text/x-c
Fix: Pass townnameparts as parameter when testing townname based companyname. (#11685)
Length of returned string could vary and pass/fail the length check with a different
string than the final selection.
Length of returned string could vary and pass/fail the length check with a different
string than the final selection.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9999:dccc36203f8a r9996:3fee1f809309 r9996:3fee1f809309 r9996:3fee1f809309 r9996:3fee1f809309 r9996:3fee1f809309 r10039:727fb45b0424 r24216:bee2183ce93e r24439:3207de2680bf r24439:3207de2680bf r24439:3207de2680bf r9996:3fee1f809309 r11331:1af5419c9807 r11331:1af5419c9807 r24216:bee2183ce93e r11331:1af5419c9807 r11331:1af5419c9807 r23088:6710c4c79ac6 r19500:ce430c37f336 r11352:9d18ed6156c5 r17418:92b22f19be94 r11352:9d18ed6156c5 r11331:1af5419c9807 r21383:942c32fb8b0e r21383:942c32fb8b0e r17630:7d818445376d r17630:7d818445376d r28013:27e846f30654 r17630:7d818445376d r28013:27e846f30654 r9996:3fee1f809309 r9996:3fee1f809309 r9996:3fee1f809309 r17098:afa706d65a49 r17098:afa706d65a49 r17098:afa706d65a49 r17098:afa706d65a49 r17098:afa706d65a49 r24522:0c6c6ad8ded0 r9996:3fee1f809309 r11331:1af5419c9807 r11331:1af5419c9807 r11331:1af5419c9807 r11331:1af5419c9807 r11331:1af5419c9807 r24216:bee2183ce93e r24216:bee2183ce93e r11331:1af5419c9807 r25144:a6cb30ee148e r24216:bee2183ce93e r9996:3fee1f809309 r28015:d55e2fd5a748 r28015:d55e2fd5a748 r28015:d55e2fd5a748 r28015:d55e2fd5a748 r9996:3fee1f809309 r9996:3fee1f809309 r28015:d55e2fd5a748 r28015:d55e2fd5a748 r28015:d55e2fd5a748 r9996:3fee1f809309 r28015:d55e2fd5a748 r9996:3fee1f809309 r9996:3fee1f809309 r28015:d55e2fd5a748 r9996:3fee1f809309 r9996:3fee1f809309 r24216:bee2183ce93e r24216:bee2183ce93e r24216:bee2183ce93e r24216:bee2183ce93e r24216:bee2183ce93e r9996:3fee1f809309 r11331:1af5419c9807 r11331:1af5419c9807 r11331:1af5419c9807 r11331:1af5419c9807 r11331:1af5419c9807 r11331:1af5419c9807 r22209:6b9e7e8f2839 r24216:bee2183ce93e r24216:bee2183ce93e r24216:bee2183ce93e r11331:1af5419c9807 r11331:1af5419c9807 r11331:1af5419c9807 r23088:6710c4c79ac6 r11352:9d18ed6156c5 r24928:f1d8013662df r25127:b131dacb88fa r25127:b131dacb88fa r11352:9d18ed6156c5 r11352:9d18ed6156c5 r11352:9d18ed6156c5 r24928:f1d8013662df r24928:f1d8013662df r11352:9d18ed6156c5 r11352:9d18ed6156c5 r11352:9d18ed6156c5 r11352:9d18ed6156c5 r11352:9d18ed6156c5 r11352:9d18ed6156c5 r11352:9d18ed6156c5 r11352:9d18ed6156c5 r11352:9d18ed6156c5 r11352:9d18ed6156c5 r24522:0c6c6ad8ded0 r25655:1030dcb7eb52 r20984:a4da9302878d r11352:9d18ed6156c5 r11352:9d18ed6156c5 r24439:3207de2680bf r24439:3207de2680bf r24439:3207de2680bf r24439:3207de2680bf r9996:3fee1f809309 r9996:3fee1f809309 r17408:1b41bc18943a r24528:a7298f737f00 r17408:1b41bc18943a r17408:1b41bc18943a r17408:1b41bc18943a r18005:27851770b57d r17408:1b41bc18943a r17408:1b41bc18943a r17408:1b41bc18943a r17408:1b41bc18943a r27147:5d938ed2c7b5 r17408:1b41bc18943a | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file ini.cpp Definition of the IniItem class, related to reading/writing '*.ini' files. */
#include "stdafx.h"
#include "debug.h"
#include "ini_type.h"
#include "string_func.h"
#include "fileio_func.h"
#include <fstream>
#ifdef __EMSCRIPTEN__
# include <emscripten.h>
#endif
#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 500)
# include <unistd.h>
# include <fcntl.h>
#endif
#ifdef _WIN32
# include <windows.h>
# include <shellapi.h>
# include "core/mem_func.hpp"
#endif
#include "safeguards.h"
/**
* Create a new ini file with given group names.
* @param list_group_names A list with group names that should be loaded as lists instead of variables. @see IGT_LIST
*/
IniFile::IniFile(const IniGroupNameList &list_group_names) : IniLoadFile(list_group_names)
{
}
/**
* Save the Ini file's data to the disk.
* @param filename the file to save to.
* @return true if saving succeeded.
*/
bool IniFile::SaveToDisk(const std::string &filename)
{
/*
* First write the configuration to a (temporary) file and then rename
* that file. This to prevent that when OpenTTD crashes during the save
* you end up with a truncated configuration file.
*/
std::string file_new{ filename };
file_new.append(".new");
std::ofstream os(OTTD2FS(file_new).c_str());
if (os.fail()) return false;
for (const IniGroup &group : this->groups) {
os << group.comment << "[" << group.name << "]\n";
for (const IniItem &item : group.items) {
os << item.comment;
/* protect item->name with quotes if needed */
if (item.name.find(' ') != std::string::npos ||
item.name[0] == '[') {
os << "\"" << item.name << "\"";
} else {
os << item.name;
}
os << " = " << item.value.value_or("") << "\n";
}
}
os << this->comment;
os.flush();
os.close();
if (os.fail()) return false;
/*
* POSIX (and friends) do not guarantee that when a file is closed it is
* flushed to the disk. So we manually flush it do disk if we have the
* APIs to do so. We only need to flush the data as the metadata itself
* (modification date etc.) is not important to us; only the real data is.
*/
#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0
int f = open(file_new.c_str(), O_RDWR);
int ret = fdatasync(f);
close(f);
if (ret != 0) return false;
#endif
#if defined(_WIN32)
/* Allocate space for one more \0 character. */
wchar_t tfilename[MAX_PATH + 1], tfile_new[MAX_PATH + 1];
wcsncpy(tfilename, OTTD2FS(filename).c_str(), MAX_PATH);
wcsncpy(tfile_new, OTTD2FS(file_new).c_str(), MAX_PATH);
/* SHFileOperation wants a double '\0' terminated string. */
tfilename[MAX_PATH - 1] = '\0';
tfile_new[MAX_PATH - 1] = '\0';
tfilename[wcslen(tfilename) + 1] = '\0';
tfile_new[wcslen(tfile_new) + 1] = '\0';
/* Rename file without any user confirmation. */
SHFILEOPSTRUCT shfopt;
MemSetT(&shfopt, 0);
shfopt.wFunc = FO_MOVE;
shfopt.fFlags = FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_SILENT;
shfopt.pFrom = tfile_new;
shfopt.pTo = tfilename;
SHFileOperation(&shfopt);
#else
if (rename(file_new.c_str(), filename.c_str()) < 0) {
Debug(misc, 0, "Renaming {} to {} failed; configuration not saved", file_new, filename);
}
#endif
#ifdef __EMSCRIPTEN__
EM_ASM(if (window["openttd_syncfs"]) openttd_syncfs());
#endif
return true;
}
/* virtual */ FILE *IniFile::OpenFile(const std::string &filename, Subdirectory subdir, size_t *size)
{
/* Open the text file in binary mode to prevent end-of-line translations
* done by ftell() and friends, as defined by K&R. */
return FioFOpenFile(filename, "rb", subdir, size);
}
/* virtual */ void IniFile::ReportFileError(const char * const pre, const char * const buffer, const char * const post)
{
ShowInfo("{}{}{}", pre, buffer, post);
}
|