Skip to content
Browse files

remove bogus fclose

  • Loading branch information...
1 parent 8a5f6aa commit 0652e5fbb1434894fde53ee5eadd70cc0486ab45 @rofl0r committed Sep 19, 2011
Showing with 0 additions and 102 deletions.
  1. +0 −84 lib/fclose.c
  2. +0 −18 lib/stdio.in.h
View
84 lib/fclose.c
@@ -1,84 +0,0 @@
-/* fclose replacement.
- Copyright (C) 2008-2011 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
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-/* Specification. */
-#include <stdio.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-#include "freading.h"
-
-/* Override fclose() to call the overridden fflush() or close(). */
-
-int
-rpl_fclose (FILE *fp)
-#undef fclose
-{
- int saved_errno = 0;
- int fd;
- int result = 0;
-
- /* Don't change behavior on memstreams. */
- fd = fileno (fp);
- if (fd < 0)
- return fclose (fp);
-
- /* We only need to flush the file if it is not reading or if it is
- seekable. This only guarantees the file position of input files
- if the fflush module is also in use. */
- if ((!freading (fp) || lseek (fileno (fp), 0, SEEK_CUR) != -1)
- && fflush (fp))
- saved_errno = errno;
-
- /* fclose() calls close(), but we need to also invoke all hooks that our
- overridden close() function invokes. See lib/close.c. */
-#if WINDOWS_SOCKETS
- /* Call the overridden close(), then the original fclose().
- Note about multithread-safety: There is a race condition where some
- other thread could open fd between our close and fclose. */
- if (close (fd) < 0 && saved_errno == 0)
- saved_errno = errno;
-
- fclose (fp); /* will fail with errno = EBADF, if we did not lose a race */
-
-#else /* !WINDOWS_SOCKETS */
- /* Call fclose() and invoke all hooks of the overridden close(). */
-
-# if REPLACE_FCHDIR
- /* Note about multithread-safety: There is a race condition here as well.
- Some other thread could open fd between our calls to fclose and
- _gl_unregister_fd. */
- result = fclose (fp);
- if (result == 0)
- _gl_unregister_fd (fd);
-# else
- /* No race condition here. */
- result = fclose (fp);
-# endif
-
-#endif /* !WINDOWS_SOCKETS */
-
- if (saved_errno != 0)
- {
- errno = saved_errno;
- result = EOF;
- }
-
- return result;
-}
View
18 lib/stdio.in.h
@@ -151,24 +151,6 @@ _GL_WARN_ON_USE (dprintf, "dprintf is unportable - "
# endif
#endif
-#if @GNULIB_FCLOSE@
-/* Close STREAM and its underlying file descriptor. */
-# if @REPLACE_FCLOSE@
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# define fclose rpl_fclose
-# endif
-_GL_FUNCDECL_RPL (fclose, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (fclose, int, (FILE *stream));
-# else
-_GL_CXXALIAS_SYS (fclose, int, (FILE *stream));
-# endif
-_GL_CXXALIASWARN (fclose);
-#elif defined GNULIB_POSIXCHECK
-# undef fclose
-/* Assume fclose is always declared. */
-_GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - "
- "use gnulib module fclose for portable POSIX compliance");
-#endif
#if @GNULIB_FFLUSH@
/* Flush all pending data on STREAM according to POSIX rules. Both

0 comments on commit 0652e5f

Please sign in to comment.
Something went wrong with that request. Please try again.