From d7991738d65a2f27c174a7e6fdc3e70ec9b96aa5 Mon Sep 17 00:00:00 2001
From: Adrien Nader <adrien@notk.org>
Date: Mon, 23 May 2011 21:56:44 +0200
Subject: [PATCH] Set stdout mode to binary under Windows.

---
 src/ChangeLog |  6 ++++++
 src/main.c    | 16 +++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index c88740b5..b827981a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-28  Adrien Nader  <adrien@notk.org> (tiny change)
+
+	* main.c [WINDOWS]: Include <io.h> and <fcntl.h>.
+	(main) [WINDOWS]: Set the stdout file mode to binary.
+	Submitted also by: Martin Panter <vadmium@gmail.com>
+
 2011-05-23  Giuseppe Scrivano  <gscrivano@gnu.org>
 
 	* retr.c (fd_read_body): Be sure the buffer size is at least 8Kb.
diff --git a/src/main.c b/src/main.c
index 3a052503..8b3212a4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -60,8 +60,13 @@ as that of the covered work.  */
 #include <getpass.h>
 #include <quote.h>
 
+#ifdef WINDOWS
+# include <io.h>
+# include <fcntl.h>
+#endif
+
 #ifdef __VMS
-#include "vms.h"
+# include "vms.h"
 #endif /* __VMS */
 
 #ifndef PATH_SEPARATOR
@@ -1249,14 +1254,7 @@ for details.\n\n"));
       if (HYPHENP (opt.output_document))
         {
 #ifdef WINDOWS
-          FILE *result;
-          result = freopen ("CONOUT$", "wb", stdout);
-          if (result == NULL)
-            {
-              logputs (LOG_NOTQUIET, _("\
-WARNING: Can't reopen standard output in binary mode;\n\
-         downloaded file may contain inappropriate line endings.\n"));
-            }
+          _setmode (_fileno (stdout), _O_BINARY);
 #endif
           output_stream = stdout;
         }
-- 
2.39.2