error: account for the possibility of freopen (stdout).

diff --git a/ChangeLog b/ChangeLog
index 5988bcf8e7eeb75dc9e5545f7ebfa75171b63c40..d7d96f783e0f43dd5cae000dbaa637a7e4f0fce5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-22  Bruno Haible  <bruno@clisp.org>
+
+       error: account for the possibility of freopen (stdout).
+       * lib/error.c: Include <unistd.h>.
+       (flush_stdout): New function, extracted from error and error_at_line.
+       Determine stdout's fd dynamically.
+       (error, error_at_line): Invoke flush_stdout.
+       * m4/error.m4 (gl_PREREQ_ERROR): Require AC_C_INLINE.
+       * modules/error (Depends-on): Add unistd.
+
 2009-11-22  Bruno Haible  <bruno@clisp.org>
 
        diffseq: Add comment.

diff --git a/lib/error.c b/lib/error.c
index af2287b2713eaf792093e27adf7d7beeac99ac30..80168a876589a15c1ce627a0e0799b7d41cd885c 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #if !_LIBC && ENABLE_NLS
 # include "gettext.h"
@@ -103,6 +104,31 @@ extern char *program_name;
 # endif        /* HAVE_STRERROR_R || defined strerror_r */
 #endif /* not _LIBC */
 
+static inline void
+flush_stdout (void)
+{
+#if !_LIBC && defined F_GETFL
+  int stdout_fd;
+
+# if GNULIB_FREOPEN_SAFER
+  /* Use of gnulib's freopen-safer module normally ensures that
+       fileno (stdout) == 1
+     whenever stdout is open.  */
+  stdout_fd = STDOUT_FILENO;
+# else
+  /* POSIX states that fileno (stdout) after fclose is unspecified.  But in
+     practice it is not a problem, because stdout is statically allocated and
+     the fd of a FILE stream is stored as a field in its allocated memory.  */
+  stdout_fd = fileno (stdout);
+# endif
+  /* POSIX states that fflush (stdout) after fclose is unspecified; it
+     is safe in glibc, but not on all other platforms.  fflush (NULL)
+     is always defined, but too draconian.  */
+  if (0 <= stdout_fd && 0 <= fcntl (stdout_fd, F_GETFL))
+#endif
+    fflush (stdout);
+}
+
 static void
 print_errno_message (int errnum)
 {
@@ -238,13 +264,7 @@ error (int status, int errnum, const char *message, ...)
                   0);
 #endif
 
-#if !_LIBC && defined F_GETFL
-  /* POSIX states that fflush (stdout) after fclose is unspecified; it
-     is safe in glibc, but not on all other platforms.  fflush (NULL)
-     is always defined, but too draconian.  */
-  if (0 <= fcntl (1, F_GETFL))
-#endif
-  fflush (stdout);
+  flush_stdout ();
 #ifdef _LIBC
   _IO_flockfile (stderr);
 #endif
@@ -303,13 +323,7 @@ error_at_line (int status, int errnum, const char *file_name,
                   0);
 #endif
 
-#if !_LIBC && defined F_GETFL
-  /* POSIX states that fflush (stdout) after fclose is unspecified; it
-     is safe in glibc, but not on all other platforms.  fflush (NULL)
-     is always defined, but too draconian.  */
-  if (0 <= fcntl (1, F_GETFL))
-#endif
-  fflush (stdout);
+  flush_stdout ();
 #ifdef _LIBC
   _IO_flockfile (stderr);
 #endif

diff --git a/m4/error.m4 b/m4/error.m4
index 7c7746e2cc8ddbf6b94471cf666fca7fe8f1a4c9..243dbda44da8f4ed930c7ccf54b2d39192b55d76 100644 (file)
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,6 +1,6 @@
-#serial 11
+#serial 12
 
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software
+# Copyright (C) 1996-1998, 2001-2004, 2009 Free Software
 # Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -18,5 +18,6 @@ AC_DEFUN([gl_ERROR],
 AC_DEFUN([gl_PREREQ_ERROR],
 [
   AC_REQUIRE([AC_FUNC_STRERROR_R])
+  AC_REQUIRE([AC_C_INLINE])
   :
 ])

diff --git a/modules/error b/modules/error
index fbeeb0d9320a69e4b041e5f6d74ed0cefc84e362..7d43aba1cc615d2d26d36c52a6ee3ba4e53b4447 100644 (file)
--- a/modules/error
+++ b/modules/error
@@ -13,6 +13,7 @@ m4/error.m4
 
 Depends-on:
 strerror
+unistd
 
 configure.ac:
 gl_ERROR