X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fcloseout.c;h=a551d1ae8be6521e7215efeb87b7996297cd11d9;hb=87538f0d5dfb46f213de5dfe7ea9ac07bb4c0c9e;hp=ac9904551b1156c5c196c2bce702dfe4fbdafbb0;hpb=accac54bfb64963d3dd300a6a714fcba6451f53c;p=gnulib.git

diff --git a/lib/closeout.c b/lib/closeout.c
index ac9904551..a551d1ae8 100644
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002 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
@@ -19,26 +19,7 @@
 # include <config.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#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
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include "closeout.h"
 
 #include <stdio.h>
 
@@ -47,34 +28,26 @@
 extern int errno;
 #endif
 
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
 
-#include "closeout.h"
 #include "error.h"
+#include "exitfail.h"
+#include "quotearg.h"
+#include "unlocked-io.h"
+#include "__fpending.h"
 
-static int default_exit_status = EXIT_FAILURE;
-static const char *file_name = NULL;
-
-/* Set the value to be used for the exit status when close_stdout is called.
-   This is useful when it is not convenient to call close_stdout_status,
-   e.g., when close_stdout is called via atexit.  */
-void
-close_stdout_set_status (int status)
-{
-  default_exit_status = status;
-}
+static const char *file_name;
 
 /* Set the file name to be reported in the event an error is detected
-   by close_stdout_status.  */
+   by close_stdout.  */
 void
 close_stdout_set_file_name (const char *file)
 {
   file_name = file;
 }
 
-/* Close standard output, exiting with status STATUS on failure.
+/* Close standard output, exiting with status 'exit_failure' on failure.
    If a program writes *anything* to stdout, that program should `fflush'
    stdout and make sure that it succeeds before exiting.  Otherwise,
    suppose that you go to the extreme of checking the return status
@@ -96,35 +69,27 @@ close_stdout_set_file_name (const char *file)
    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_status (int status)
+close_stdout (void)
 {
-#ifdef EBADF
-  struct stat sbuf;
-  if (fstat (STDOUT_FILENO, &sbuf) && errno == EBADF)
-    return;
-#endif
+  int e = ferror (stdout) ? 0 : -1;
 
-  if (ferror (stdout))
-    {
-      if (file_name)
-	error (status, 0, _("%s: write error"), file_name);
-      else
-	error (status, 0, _("write error"));
-    }
+  /* If the stream's error bit is clear and there is nothing to flush,
+     then return right away.  */
+  if (e && __fpending (stdout) == 0)
+    return;
 
   if (fclose (stdout) != 0)
+    e = errno;
+
+  if (0 <= e)
     {
+      char const *write_error = _("write error");
       if (file_name)
-	error (status, errno, _("%s: write error"), file_name);
+	error (exit_failure, e, "%s: %s", quotearg_colon (file_name),
+	       write_error);
       else
-	error (status, errno, _("write error"));
+	error (exit_failure, e, "%s", write_error);
     }
 }
-
-/* Close standard output, exiting with status EXIT_FAILURE on failure.  */
-void
-close_stdout (void)
-{
-  close_stdout_status (default_exit_status);
-}