diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-08 16:42:45 -0800 |
---|---|---|
committer | Mikhail Kashkarov <m.kashkarov@partner.samsung.com> | 2019-12-02 16:36:47 +0300 |
commit | 92ff96e389277bcf24bc8451a36c750a68304d89 (patch) | |
tree | 0649c2fe924e482093aef03fb0290ad86a12b4a0 | |
parent | dab36d30baab71e50ff3bcc6eb854ff09d8ca5fb (diff) | |
download | m4-sandbox/mkashkarov/tizen_6.0_build.tar.gz m4-sandbox/mkashkarov/tizen_6.0_build.tar.bz2 m4-sandbox/mkashkarov/tizen_6.0_build.zip |
fflush: be more paranoid about libio.h changesandbox/mkashkarov/tizen_6.0_build
Suggested by Eli Zaretskii in:
https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html
* lib/fbufmode.c (fbufmode):
* lib/fflush.c (clear_ungetc_buffer_preserving_position)
(disable_seek_optimization, rpl_fflush):
* lib/fpending.c (__fpending):
* lib/fpurge.c (fpurge):
* lib/freadable.c (freadable):
* lib/freadahead.c (freadahead):
* lib/freading.c (freading):
* lib/freadptr.c (freadptr):
* lib/freadseek.c (freadptrinc):
* lib/fseeko.c (fseeko):
* lib/fseterr.c (fseterr):
* lib/fwritable.c (fwritable):
* lib/fwriting.c (fwriting):
Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN.
(cherry picked from gnulib commit 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad)
-rw-r--r-- | ChangeLog | 21 | ||||
-rw-r--r-- | lib/fflush.c | 9 | ||||
-rw-r--r-- | lib/fpurge.c | 3 | ||||
-rw-r--r-- | lib/freadahead.c | 3 | ||||
-rw-r--r-- | lib/freading.c | 3 | ||||
-rw-r--r-- | lib/fseeko.c | 6 |
6 files changed, 37 insertions, 8 deletions
@@ -1,3 +1,24 @@ +2018-03-08 Paul Eggert <eggert@cs.ucla.edu> + + fflush: be more paranoid about libio.h change + Suggested by Eli Zaretskii in: + https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html + * lib/fbufmode.c (fbufmode): + * lib/fflush.c (clear_ungetc_buffer_preserving_position) + (disable_seek_optimization, rpl_fflush): + * lib/fpending.c (__fpending): + * lib/fpurge.c (fpurge): + * lib/freadable.c (freadable): + * lib/freadahead.c (freadahead): + * lib/freading.c (freading): + * lib/freadptr.c (freadptr): + * lib/freadseek.c (freadptrinc): + * lib/fseeko.c (fseeko): + * lib/fseterr.c (fseterr): + * lib/fwritable.c (fwritable): + * lib/fwriting.c (fwriting): + Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN. + 2018-03-05 Paul Eggert <eggert@cs.ucla.edu> fflush: adjust to glibc 2.28 libio.h removal diff --git a/lib/fflush.c b/lib/fflush.c index 0c82feb..5547d54 100644 --- a/lib/fflush.c +++ b/lib/fflush.c @@ -33,7 +33,8 @@ #undef fflush -#if defined _IO_EOF_SEEN || __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 @@ -71,7 +72,8 @@ clear_ungetc_buffer (FILE *fp) #endif -#if ! (defined _IO_EOF_SEEN || __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 __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ @@ -145,7 +147,8 @@ rpl_fflush (FILE *stream) if (stream == NULL || ! freading (stream)) return fflush (stream); -#if defined _IO_EOF_SEEN || __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); diff --git a/lib/fpurge.c b/lib/fpurge.c index a60f0ae..b6c8fa6 100644 --- a/lib/fpurge.c +++ b/lib/fpurge.c @@ -61,7 +61,8 @@ fpurge (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -# if defined _IO_EOF_SEEN || __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 */ fp->_IO_read_end = fp->_IO_read_ptr; fp->_IO_write_ptr = fp->_IO_write_base; /* Avoid memory leak when there is an active ungetc buffer. */ diff --git a/lib/freadahead.c b/lib/freadahead.c index 1ee86b0..3073717 100644 --- a/lib/freadahead.c +++ b/lib/freadahead.c @@ -25,7 +25,8 @@ size_t freadahead (FILE *fp) { -#if defined _IO_EOF_SEEN || __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 (fp->_IO_write_ptr > fp->_IO_write_base) return 0; return (fp->_IO_read_end - fp->_IO_read_ptr) diff --git a/lib/freading.c b/lib/freading.c index 61dda1a..ed7ad94 100644 --- a/lib/freading.c +++ b/lib/freading.c @@ -31,7 +31,8 @@ freading (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -# if defined _IO_EOF_SEEN || __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 */ return ((fp->_flags & _IO_NO_WRITES) != 0 || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 && fp->_IO_read_base != NULL)); diff --git a/lib/fseeko.c b/lib/fseeko.c index d01397e..93f1dfc 100644 --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence) #endif /* These tests are based on fpurge.c. */ -#if defined _IO_EOF_SEEN || __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 (fp->_IO_read_end == fp->_IO_read_ptr && fp->_IO_write_ptr == fp->_IO_write_base && fp->_IO_save_base == NULL) @@ -121,7 +122,8 @@ fseeko (FILE *fp, off_t offset, int whence) return -1; } -#if defined _IO_EOF_SEEN || __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 */ fp->_flags &= ~_IO_EOF_SEEN; fp->_offset = pos; #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ |