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

Codechange: settingsgen's CopyFile actually appends. (#12485)

Browse Source
This commit is contained in:
Peter Nelson
2024-04-12 13:01:16 +01:00
committed by GitHub
parent 003906becb
commit 44b8210037
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/settingsgen/settingsgen.cpp
View File

@@ -322,11 +322,11 @@ static void DumpSections(const IniLoadFile &ifile)
} }
/** /**
* Copy a file to the output. * Append a file to the output stream.
* @param fname Filename of file to copy. * @param fname Filename of file to append.
* @param out_fp Output stream to write to. * @param out_fp Output stream to write to.
*/ */
static void CopyFile(const char *fname, FILE *out_fp) static void AppendFile(const char *fname, FILE *out_fp)
{ {
if (fname == nullptr) return; if (fname == nullptr) return;
@@ -476,10 +476,10 @@ int CDECL main(int argc, char *argv[])
/* Write output. */ /* Write output. */
if (output_file == nullptr) { if (output_file == nullptr) {
CopyFile(before_file, stdout); AppendFile(before_file, stdout);
_stored_output.Write(stdout); _stored_output.Write(stdout);
_post_amble_output.Write(stdout); _post_amble_output.Write(stdout);
CopyFile(after_file, stdout); AppendFile(after_file, stdout);
} else { } else {
static const char * const tmp_output = "tmp2.xxx"; static const char * const tmp_output = "tmp2.xxx";
@@ -487,10 +487,10 @@ int CDECL main(int argc, char *argv[])
if (fp == nullptr) { if (fp == nullptr) {
FatalError("Cannot open file {}", tmp_output); FatalError("Cannot open file {}", tmp_output);
} }
CopyFile(before_file, fp); AppendFile(before_file, fp);
_stored_output.Write(fp); _stored_output.Write(fp);
_post_amble_output.Write(fp); _post_amble_output.Write(fp);
CopyFile(after_file, fp); AppendFile(after_file, fp);
fclose(fp); fclose(fp);
if (CompareFiles(tmp_output, output_file)) { if (CompareFiles(tmp_output, output_file)) {