Override freopen more carefully.

diff --git a/ChangeLog b/ChangeLog
index 56bc03067c86d834a65e3f1218655125975c29ad..53789ebdc586c86da52c547e9d9757c5f4f7e112 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
 2008-09-28  Bruno Haible  <bruno@clisp.org>
 
+       Override freopen more carefully.
+       * lib/freopen.c (orig_freopen): New function.
+       (rpl_freopen): Use orig_freopen instead of freopen.
+       * m4/freopen.m4 (gl_PREREQ_FREOPEN): New macro.
+       (gl_FUNC_FREOPEN): Invoke it.
+
        Override fopen more carefully.
        * lib/fopen.c (orig_fopen): New function.
-       (rpl_fopen): Use orig_fopen instead of open.
+       (rpl_fopen): Use orig_fopen instead of fopen.
        * m4/fopen.m4 (gl_PREREQ_FOPEN): New macro.
        (gl_FUNC_FOPEN): Invoke it.
        Needed on AIX. Reported by Rainer Tammer <tammer@tammer.net>.

diff --git a/lib/freopen.c b/lib/freopen.c
index 5942bb0b3873a8520c6cfc5ea08f5a8e42856652..71c663cfbeb1c57132ad1ba4e5865119d938b6e4 100644 (file)
--- a/lib/freopen.c
+++ b/lib/freopen.c
@@ -1,5 +1,5 @@
 /* Open a stream to a file.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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
@@ -18,6 +18,17 @@
 
 #include <config.h>
 
+/* Get the original definition of freopen.  It might be defined as a macro.  */
+#define __need_FILE
+#include <stdio.h>
+#undef __need_FILE
+
+static inline FILE *
+orig_freopen (const char *filename, const char *mode, FILE *stream)
+{
+  return freopen (filename, mode, stream);
+}
+
 /* Specification.  */
 #include <stdio.h>
 
@@ -25,12 +36,11 @@
 
 FILE *
 rpl_freopen (const char *filename, const char *mode, FILE *stream)
-#undef freopen
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
   if (strcmp (filename, "/dev/null") == 0)
     filename = "NUL";
 #endif
 
-  return freopen (filename, mode, stream);
+  return orig_freopen (filename, mode, stream);
 }

diff --git a/m4/freopen.m4 b/m4/freopen.m4
index 0149ebd65e161d9bf62511f8a6792f88859d64a0..949609e62094ba3004f688ab33b14ca37d4ab892 100644 (file)
--- a/m4/freopen.m4
+++ b/m4/freopen.m4
@@ -1,5 +1,5 @@
-# freopen.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# freopen.m4 serial 2
+dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,6 +12,13 @@ AC_DEFUN([gl_FUNC_FREOPEN],
     mingw* | pw*)
       REPLACE_FREOPEN=1
       AC_LIBOBJ([freopen])
+      gl_PREREQ_FREOPEN
       ;;
   esac
 ])
+
+# Prerequisites of lib/freopen.c.
+AC_DEFUN([gl_PREREQ_FREOPEN],
+[
+  AC_REQUIRE([AC_C_INLINE])
+])