projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
delete trailing whitespace from control files
[debian/gzip]
/
lib
/
fflush.c
diff --git
a/lib/fflush.c
b/lib/fflush.c
index 2bd7cc9f1c90d5c411a4448995850a4ffd46165d..a140b7ad9a06946ed0590ad2ed4499fba8edb412 100644
(file)
--- a/
lib/fflush.c
+++ b/
lib/fflush.c
@@
-1,5
+1,5
@@
/* fflush.c -- allow flushing input streams
/* fflush.c -- allow flushing input streams
- Copyright (C) 2007-201
6
Free Software Foundation, Inc.
+ Copyright (C) 2007-201
8
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
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
@@
-12,7
+12,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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/>. */
+ along with this program. If not, see <http
s
://www.gnu.org/licenses/>. */
/* Written by Eric Blake. */
/* Written by Eric Blake. */
@@
-33,7
+33,8
@@
#undef fflush
#undef fflush
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+/* GNU libc, BeOS, Haiku, Linux libc5 */
/* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
static void
/* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
static void
@@
-51,7
+52,7
@@
static void
clear_ungetc_buffer (FILE *fp)
{
# if defined __sferror || defined __DragonFly__ || defined __ANDROID__
clear_ungetc_buffer (FILE *fp)
{
# if defined __sferror || defined __DragonFly__ || defined __ANDROID__
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin,
Minix 3,
Android */
if (HASUB (fp))
{
fp_->_p += fp_->_r;
if (HASUB (fp))
{
fp_->_p += fp_->_r;
@@
-63,7
+64,7
@@
clear_ungetc_buffer (FILE *fp)
fp->_ungetc_count = 0;
fp->_rcount = - fp->_rcount;
}
fp->_ungetc_count = 0;
fp->_rcount = - fp->_rcount;
}
-# elif defined _IOERR /* Minix, AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw,
NonStop Kernel
*/
+# elif defined _IOERR /* Minix, AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw,
MSVC, NonStop Kernel, OpenVMS
*/
/* Nothing to do. */
# else /* other implementations */
fseeko (fp, 0, SEEK_CUR);
/* Nothing to do. */
# else /* other implementations */
fseeko (fp, 0, SEEK_CUR);
@@
-72,10
+73,11
@@
clear_ungetc_buffer (FILE *fp)
#endif
#endif
-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1)
+/* GNU libc, BeOS, Haiku, Linux libc5 */
# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
-/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin,
Minix 3,
Android */
static int
disable_seek_optimization (FILE *fp)
static int
disable_seek_optimization (FILE *fp)
@@
-98,7
+100,7
@@
update_fpos_cache (FILE *fp _GL_UNUSED_PARAMETER,
off_t pos _GL_UNUSED_PARAMETER)
{
# if defined __sferror || defined __DragonFly__ || defined __ANDROID__
off_t pos _GL_UNUSED_PARAMETER)
{
# if defined __sferror || defined __DragonFly__ || defined __ANDROID__
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin,
Minix 3,
Android */
# if defined __CYGWIN__
/* fp_->_offset is typed as an integer. */
fp_->_offset = pos;
# if defined __CYGWIN__
/* fp_->_offset is typed as an integer. */
fp_->_offset = pos;
@@
-148,7
+150,8
@@
rpl_fflush (FILE *stream)
if (stream == NULL || ! freading (stream))
return fflush (stream);
if (stream == NULL || ! freading (stream))
return fflush (stream);
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
clear_ungetc_buffer_preserving_position (stream);
clear_ungetc_buffer_preserving_position (stream);
@@
-199,7
+202,7
@@
rpl_fflush (FILE *stream)
}
# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
}
# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin,
Minix 3,
Android */
{
/* Disable seek optimization for the next fseeko call. This tells the
{
/* Disable seek optimization for the next fseeko call. This tells the