diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-23 13:55:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-01-23 14:29:07 (GMT) |
| commit | 98628de812c4724fb2da199abb5fe08eeb5a1a64 (patch) | |
| tree | 66e7c15536fede8e4b4f266147d19754e48311b8 /Source/cmSystemTools.cxx | |
| parent | 3b588ac58256540e6dc974cf2d1a122c95f19171 (diff) | |
| download | CMake-98628de812c4724fb2da199abb5fe08eeb5a1a64.zip CMake-98628de812c4724fb2da199abb5fe08eeb5a1a64.tar.gz CMake-98628de812c4724fb2da199abb5fe08eeb5a1a64.tar.bz2 | |
Extend libuv file translate mode workaround to all executables
Since libuv commit v1.14.1~7 (win: add uv__once_init() calls,
2017-08-30) the libuv initialization of the file translate mode may take
place even if we do not use a uv loop. This change was included in our
libuv update commit f4a26c748b (libuv 2018-01-19). Therefore use of
libuv even through `cmSystemTools::GetRealPath` in any executable may
trigger its file translate mode setting.
Factor out the logic added to `cmake.exe` by commit v3.9.0-rc4~10^2
(cmake: Fix default file translate mode when using libuv, 2017-06-13)
and re-use to initialize all executables.
Issue: #16962
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index c321236..06b0b3c 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -51,6 +51,8 @@ // include wincrypt.h after windows.h #include <wincrypt.h> +#include <fcntl.h> /* _O_TEXT */ + #include "cm_uv.h" #else #include <sys/time.h> @@ -980,6 +982,21 @@ std::string cmSystemTools::GetRealPath(const std::string& path, } #endif +void cmSystemTools::InitializeLibUV() +{ +#if defined(_WIN32) + // Perform libuv one-time initialization now, and then un-do its + // global _fmode setting so that using libuv does not change the + // default file text/binary mode. See libuv issue 840. + uv_loop_close(uv_default_loop()); +#ifdef _MSC_VER + _set_fmode(_O_TEXT); +#else + _fmode = _O_TEXT; +#endif +#endif +} + bool cmSystemTools::RenameFile(const char* oldname, const char* newname) { #ifdef _WIN32 |