From: Micah Cowan <micah@cowan.name>
Date: Sun, 1 Mar 2009 10:57:14 +0000 (-0800)
Subject: Merge.
X-Git-Tag: v1.13~366
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=4092d7eedc1ea90b03cc2922a5228c59616438b2;hp=57a7ebef9311f18be9983c90355afc5c15ca843d

Merge.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 05b56e8c..82531a83 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-27  Gisle Vanem  <gvanem@broadpark.no>
+
+	* main.c (main): "freopen (NULL,.." causes an assertion in MSVC
+	debug-mode.  I.e. NULL isn't legal. But the "CONOUT$" device works
+	fine.
+
 2009-02-27  Steven Schubiger  <stsc@member.fsf.org>
 
 	* ftp.c (ftp_loop_internal): Don't claim for FTP retrievals
diff --git a/src/main.c b/src/main.c
index 02ecb1d6..7c921b77 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1124,7 +1124,7 @@ for details.\n\n"));
         {
 #ifdef WINDOWS
           FILE *result;
-          result = freopen (NULL, "wb", stdout);
+          result = freopen ("CONAIR$", "wb", stdout);
           if (result == NULL)
             {
               logputs (LOG_NOTQUIET, _("\