commit a505bcc7ed58ba95bfb9ef0922281fb91e295eb8
author Dan Albert <danalbert@google.com> Fri May 15 21:47:07 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 15 21:47:07 2015 +0000
tree f57b296394539fe7a84631a76fcf892ef243192b
parent 69dc0c27146b67f07abe61656aeba9e61b155dfc
parent e19e5ff4a010c98313111d1556b4ea2b718f862c

Merge "adb: win32: fix daemon acknowledgement"

adb/client/main.cpp

diff --git a/adb/client/main.cpp b/adb/client/main.cpp
index 468909a..f48182d 100644
--- a/adb/client/main.cpp
+++ b/adb/client/main.cpp
@@ -156,6 +156,10 @@
         // TODO(danalbert): Why do we use stdout for Windows?
 #if defined(_WIN32)
         int reply_fd = STDOUT_FILENO;
+        // Change stdout mode to binary so \n => \r\n translation does not
+        // occur. In a moment stdout will be reopened to the daemon log file
+        // anyway.
+        _setmode(reply_fd, _O_BINARY);
 #else
         int reply_fd = STDERR_FILENO;
 #endif