Index: base/logging.cc |
diff --git a/base/logging.cc b/base/logging.cc |
index 98cecd094fd84e7312c9a3e9998dfb44cfd05925..fca625ab3a7124ef02a48df05a1296fa5357dacd 100644 |
--- a/base/logging.cc |
+++ b/base/logging.cc |
@@ -13,8 +13,6 @@ |
#if defined(OS_WIN) |
#include <io.h> |
#include <windows.h> |
-#include "base/files/file_path.h" |
-#include "base/files/file_util.h" |
typedef HANDLE FileHandle; |
typedef HANDLE MutexHandle; |
// Windows warns on using write(). It prefers _write(). |
@@ -290,12 +288,18 @@ bool InitializeLogFileHandle() { |
OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); |
if (g_log_file == INVALID_HANDLE_VALUE || g_log_file == nullptr) { |
// try the current directory |
- base::FilePath file_path; |
- if (!base::GetCurrentDirectory(&file_path)) |
+ wchar_t system_buffer[MAX_PATH]; |
+ system_buffer[0] = 0; |
+ DWORD len = ::GetCurrentDirectory(arraysize(system_buffer), |
Lei Zhang
2016/06/15 22:50:45
Is the rest of the CL going to keep someone from l
ananta
2016/06/15 23:09:53
It won't. We are looking into addressing this by s
|
+ system_buffer); |
+ if (len == 0 || len > arraysize(system_buffer)) |
return false; |
- *g_log_file_name = file_path.Append( |
- FILE_PATH_LITERAL("debug.log")).value(); |
+ *g_log_file_name = system_buffer; |
+ // Append a trailing backslash if needed. |
+ if (g_log_file_name->back() != L'\\') |
Lei Zhang
2016/06/15 22:50:45
Does it hurt if this check goes away and we just a
ananta
2016/06/15 23:09:53
That would work. I think it is better to avoid the
|
+ *g_log_file_name += L"\\"; |
+ *g_log_file_name += L"debug.log"; |
g_log_file = CreateFile(g_log_file_name->c_str(), FILE_APPEND_DATA, |
FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, |