X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcloseout.c;h=830f16f8ae8a6e7f6177b0ace34a387708e5043e;hb=e5cf463ba47a430a4a2509e029222682f974499f;hp=a4a986fa3f1a617e597923d03a0ce08a80105010;hpb=67f394c1d2be473276ccd5e071f986511a13e212;p=gnulib.git

diff --git a/lib/closeout.c b/lib/closeout.c
index a4a986fa3..830f16f8a 100644
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -1,5 +1,7 @@
-/* closeout.c - close standard output
-   Copyright (C) 1998 Free Software Foundation, Inc.
+/* Close standard output and standard error, exiting with a diagnostic on error.
+
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,48 +15,72 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
-
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
+#include <config.h>
 
-#include <stdio.h>
 #include "closeout.h"
+
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+#include "close-stream.h"
 #include "error.h"
+#include "exitfail.h"
+#include "quotearg.h"
 
-/* Close standard output, exiting with status STATUS on failure.  */
+static const char *file_name;
+
+/* Set the file name to be reported in the event an error is detected
+   by close_stdout.  */
 void
-close_stdout_status (int status)
+close_stdout_set_file_name (const char *file)
 {
-  if (ferror (stdout))
-    error (status, 0, _("write error"));
-  if (fclose (stdout) != 0)
-    error (status, errno, _("write error"));
+  file_name = file;
 }
 
-/* Close standard output, exiting with status EXIT_FAILURE on failure.  */
+/* Close standard output.  On error, issue a diagnostic and _exit
+   with status 'exit_failure'.
+
+   Also close standard error.  On error, _exit with status 'exit_failure'.
+
+   Since close_stdout is commonly registered via 'atexit', POSIX
+   and the C standard both say that it should not call 'exit',
+   because the behavior is undefined if 'exit' is called more than
+   once.  So it calls '_exit' instead of 'exit'.  If close_stdout
+   is registered via atexit before other functions are registered,
+   the other functions can act before this _exit is invoked.
+
+   Applications that use close_stdout should flush any streams
+   other than stdout and stderr before exiting, since the call to
+   _exit will bypass other buffer flushing.  Applications should
+   be flushing and closing other streams anyway, to check for I/O
+   errors.  Also, applications should not use tmpfile, since _exit
+   can bypass the removal of these files.
+
+   It's important to detect such failures and exit nonzero because many
+   tools (most notably `make' and other build-management systems) depend
+   on being able to detect failure in other tools via their exit status.  */
+
 void
 close_stdout (void)
 {
-  close_stdout_status (EXIT_FAILURE);
+  if (close_stream (stdout) != 0)
+    {
+      char const *write_error = _("write error");
+      if (file_name)
+	error (0, errno, "%s: %s", quotearg_colon (file_name),
+	       write_error);
+      else
+	error (0, errno, "%s", write_error);
+
+      _exit (exit_failure);
+    }
+
+   if (close_stream (stderr) != 0)
+     _exit (exit_failure);
 }