X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcloseout.c;h=bdda59feeb019a1aa38237802acaecb3d8248e2b;hb=1380e0f92ddac41ee242a1f57cd2de871dbd892b;hp=ed02a7df1861b74e57eb4503970c84e4e1e45f8c;hpb=97a560dd264cb35d71a0fd60d8852323392e32b1;p=gnulib.git

diff --git a/lib/closeout.c b/lib/closeout.c
index ed02a7df1..bdda59fee 100644
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -33,16 +33,20 @@
 # define EXIT_FAILURE 1
 #endif
 
+#include <stdio.h>
+
 #include <errno.h>
 #ifndef errno
 extern int errno;
 #endif
 
-#include <stdio.h>
 #include "closeout.h"
 #include "error.h"
+#include "quotearg.h"
+#include "__fpending.h"
 
 static int default_exit_status = EXIT_FAILURE;
+static const char *file_name;
 
 /* 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,
@@ -53,6 +57,14 @@ close_stdout_set_status (int status)
   default_exit_status = status;
 }
 
+/* Set the file name to be reported in the event an error is detected
+   by close_stdout_status.  */
+void
+close_stdout_set_file_name (const char *file)
+{
+  file_name = file;
+}
+
 /* Close standard output, exiting with status STATUS on failure.
    If a program writes *anything* to stdout, that program should `fflush'
    stdout and make sure that it succeeds before exiting.  Otherwise,
@@ -75,13 +87,26 @@ close_stdout_set_status (int status)
    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)
 {
-  if (ferror (stdout))
-    error (status, 0, _("write error"));
+  int e = ferror (stdout) ? 0 : -1;
+
+  if (__fpending (stdout) == 0)
+    return;
+
   if (fclose (stdout) != 0)
-    error (status, errno, _("write error"));
+    e = errno;
+
+  if (0 <= e)
+    {
+      char const *write_error = _("write error");
+      if (file_name)
+	error (status, e, "%s: %s", quotearg_colon (file_name), write_error);
+      else
+	error (status, e, "%s", write_error);
+    }
 }
 
 /* Close standard output, exiting with status EXIT_FAILURE on failure.  */