Skip to content

Fix contribute watchOngoingGameInFile for non-ASCII paths on Windows #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Hoigin wants to merge 1 commit into from
Closed

Fix contribute watchOngoingGameInFile for non-ASCII paths on Windows #1253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions cpp/command/contribute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@
#include "../command/commandline.h"
#include "../main.h"

#if __MINGW32__
// `std::wstring_convert` needs explicit including in case of MINGW
#include <locale>
#endif

#ifdef OS_IS_WINDOWS
#include <codecvt>
#endif

#ifndef BUILD_DISTRIBUTED

int MainCmds::contribute(const std::vector<std::string>& args) {
Expand Down Expand Up @@ -802,10 +811,17 @@ int MainCmds::contribute(const vector<string>& args) {
std::unique_ptr<std::ostream> outputEachMove = nullptr;
std::function<void()> flushOutputEachMove = nullptr;
if(gameLoopThreadIdx == 0 && watchOngoingGameInFile) {
// TODO someday - doesn't handle non-ascii paths.
#ifdef OS_IS_WINDOWS
std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
std::wstring watchOngoingGameInFileWideName;
try {
watchOngoingGameInFileWideName = converter.from_bytes(watchOngoingGameInFileName);
}
catch(const std::range_error&) {
throw StringError("watchOngoingGameFileName is not valid UTF-8: " + watchOngoingGameInFileName);
}
FILE* file = NULL;
fopen_s(&file, watchOngoingGameInFileName.c_str(), "a");
file = _wfopen(watchOngoingGameInFileWideName.c_str(), L"a");
if(file == NULL)
throw StringError("Could not open file: " + watchOngoingGameInFileName);
outputEachMove = std::make_unique<std::ofstream>(file);
Expand Down