X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffreopen.c;h=b5812611ad0d469499f64eceb81b94bbfcabee47;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=d36ec5c88c1ea20d40142140ffefd8b38f9330f2;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/freopen.c b/lib/freopen.c
index d36ec5c88..b5812611a 100644
--- 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-2013 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
@@ -16,21 +16,36 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
+/* If the user's config.h happens to include <stdio.h>, let it include only
+   the system's <stdio.h> here, so that orig_freopen doesn't recurse to
+   rpl_freopen.  */
+#define __need_FILE
 #include <config.h>
 
-/* Specification.  */
+/* Get the original definition of freopen.  It might be defined as a macro.  */
 #include <stdio.h>
+#undef __need_FILE
+
+static FILE *
+orig_freopen (const char *filename, const char *mode, FILE *stream)
+{
+  return freopen (filename, mode, stream);
+}
+
+/* Specification.  */
+/* Write "stdio.h" here, not <stdio.h>, otherwise OSF/1 5.1 DTK cc eliminates
+   this include because of the preliminary #include <stdio.h> above.  */
+#include "stdio.h"
 
 #include <string.h>
 
 FILE *
-freopen (const char *filename, const char *mode, FILE *stream)
-#undef freopen
+rpl_freopen (const char *filename, const char *mode, FILE *stream)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  if (strcmp (filename, "/dev/null") == 0)
+  if (filename != NULL && strcmp (filename, "/dev/null") == 0)
     filename = "NUL";
 #endif
 
-  return freopen (filename, mode, stream);
+  return orig_freopen (filename, mode, stream);
 }