Do not close stdout twice.

diff --git a/ChangeLog b/ChangeLog
index 2f0f96553362ccb9a6b99c01d995e31bcf700c33..ef8bbefe02fae9045abd90441c491999b03cd299 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-16  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * bootstrap.conf (gnulib_modules): Remove `closeout'.
+       Reported by: Micah Cowan  <micah@cowan.name>.
+

 2012-05-31  Ángel González <keisial@gmail.com>
 
        * convert.c: fix segfault on wrong urls (bug 36570)
 2012-05-31  Ángel González <keisial@gmail.com>
 
        * convert.c: fix segfault on wrong urls (bug 36570)

diff --git a/bootstrap.conf b/bootstrap.conf
index a784a9062d13710b0be4f42890173f837fe924a8..febd11da11dd48f9aa9010cc94877479d505f23e 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -33,7 +33,6 @@ bind
 c-ctype
 clock-time
 close
 c-ctype
 clock-time
 close

-closeout

 connect
 fcntl
 futimens
 connect
 fcntl
 futimens

diff --git a/src/ChangeLog b/src/ChangeLog
index 3cb29635fe69acc9f95162bde55a10d43bc62705..bd5945224ec2f12489d2b3d631e174c608d8fcee 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-16  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * main.c: Do not include "stdout.h".
+       (main): Do not register `close_stdout' at exit.
+       Reported by: Micah Cowan  <micah@cowan.name>.
+

 2012-06-09  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * main.c (print_help): Move --report-speed under the section
 2012-06-09  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * main.c (print_help): Move --report-speed under the section

diff --git a/src/main.c b/src/main.c
index 94a33e75a25aae2af1ce8f3c6bdb3beb86adefb5..291fe0774bf5161ad457050cc1442c5a3bc38d3d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -56,7 +56,6 @@ as that of the covered work.  */
 #include "http.h"               /* for save_cookies */
 #include "ptimer.h"
 #include "warc.h"
 #include "http.h"               /* for save_cookies */
 #include "ptimer.h"
 #include "warc.h"

-#include "closeout.h"

 #include <getopt.h>
 #include <getpass.h>
 #include <quote.h>
 #include <getopt.h>
 #include <getpass.h>
 #include <quote.h>


@@ -982,8 +981,6 @@ main (int argc, char **argv)
 
   i18n_initialize ();
 
 
   i18n_initialize ();
 

-  atexit (close_stdout);
-

   /* Construct the name of the executable, without the directory part.  */
 #ifdef __VMS
   /* On VMS, lose the "dev:[dir]" prefix and the ".EXE;nnn" suffix. */
   /* Construct the name of the executable, without the directory part.  */
 #ifdef __VMS
   /* On VMS, lose the "dev:[dir]" prefix and the ".EXE;nnn" suffix. */