New function fwriteerror_no_ebadf.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0738759c028405b243d58f60b869d33c3aadc612..0b3f6c38d2da6d0178ee98661305f3d8128d6893 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-29  Bruno Haible  <bruno@clisp.org>
+
+       * fwriteerror.h (fwriteerror_no_ebadf): New declaration.
+       * (do_fwriteerror): Renamed from fwriteerror. Add ignore_ebadf
+       argument. Set stdout_closed before testing for ferror, not after.
+       (fwriteerror, fwriteerror_no_ebadf): New functions.
+
 2006-09-28  Bruno Haible  <bruno@clisp.org>
 
        * strndup.h: Simplify the redefinition of strndup.

diff --git a/lib/fwriteerror.c b/lib/fwriteerror.c
index 4d4ad81b99efc1f051ee70725c63559c2f74d278..b3d6d2ae48546ac93fccdc5ba4913222a7d8f716 100644 (file)
--- a/lib/fwriteerror.c
+++ b/lib/fwriteerror.c
@@ -24,14 +24,20 @@
 #include <errno.h>
 #include <stdbool.h>
 
-int
-fwriteerror (FILE *fp)
+static int
+do_fwriteerror (FILE *fp, bool ignore_ebadf)
 {
   /* State to allow multiple calls to fwriteerror (stdout).  */
   static bool stdout_closed = false;
 
-  if (fp == stdout && stdout_closed)
-    return 0;
+  if (fp == stdout)
+    {
+      if (stdout_closed)
+       return 0;
+
+      /* If we are closing stdout, don't attempt to do it later again.  */
+      stdout_closed = true;
+    }
 
   /* Need to
      1. test the error indicator of the stream,
@@ -56,25 +62,47 @@ fwriteerror (FILE *fp)
        goto close_preserving_errno; /* errno is set here */
       /* Give up on errno.  */
       errno = 0;
-     close_preserving_errno:
-      /* There's an error.  Nevertheless call fclose(fp), for consistency
-        with the other cases.  */
-      {
-       int saved_errno = errno;
-       fclose (fp);
-       errno = saved_errno;
-       return -1;
-      }
+      goto close_preserving_errno;
     }
 
-  /* If we are closing stdout, don't attempt to do it later again.  */
-  if (fp == stdout)
-    stdout_closed = true;
-
-  if (fclose (fp))
-    return -1; /* errno is set here */
+  if (ignore_ebadf)
+    {
+      /* We need an explicit fflush to tell whether some output was already
+        done on FP.  */
+      if (fflush (fp))
+       goto close_preserving_errno; /* errno is set here */
+      if (fclose (fp) && errno != EBADF)
+       return -1; /* errno is set here */
+    }
+  else
+    {
+      if (fclose (fp))
+       return -1; /* errno is set here */
+    }
 
   return 0;
+
+ close_preserving_errno:
+  /* There's an error.  Nevertheless call fclose(fp), for consistency
+     with the other cases.  */
+  {
+    int saved_errno = errno;
+    fclose (fp);
+    errno = saved_errno;
+    return -1;
+  }
+}
+
+int
+fwriteerror (FILE *fp)
+{
+  return do_fwriteerror (fp, false);
+}
+
+int
+fwriteerror_no_ebadf (FILE *fp)
+{
+  return do_fwriteerror (fp, true);
 }
 
 

diff --git a/lib/fwriteerror.h b/lib/fwriteerror.h
index c823ef7f25c10cd24c12d3abf41a21cfc59cb77e..ebbe1be6c9db6b0a895028a55201d3e5e6e23c49 100644 (file)
--- a/lib/fwriteerror.h
+++ b/lib/fwriteerror.h
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -49,3 +49,7 @@
    For any given stream FP other than stdout, fwriteerror (FP) may only be
    called once.  */
 extern int fwriteerror (FILE *fp);
+
+/* Likewise, but don't consider it an error if FP has an invalid file
+   descriptor and no output was done to FP.  */
+extern int fwriteerror_no_ebadf (FILE *fp);