diff options
author | yan11.meng <yan11.meng@samsung.com> | 2020-01-04 23:19:32 +0900 |
---|---|---|
committer | yan11.meng <yan11.meng@samsung.com> | 2020-01-04 23:19:32 +0900 |
commit | 3d6ab5b72718bc12c359761feb84e2f49d6c6852 (patch) | |
tree | 942b487b76d731693ca85eebfa0e082e9b3f7e5b | |
parent | f511dbbffd36de27923e6d7a711fbd5b62742cca (diff) | |
parent | 92ff96e389277bcf24bc8451a36c750a68304d89 (diff) | |
download | m4-accepted/tizen_6.0_base_tool.tar.gz m4-accepted/tizen_6.0_base_tool.tar.bz2 m4-accepted/tizen_6.0_base_tool.zip |
Merge remote-tracking branch 'origin/sandbox/mkashkarov/tizen_6.0_build' into tizen_basetizen_6.0.m2_releasesubmit/tizen_base/20200109.182200submit/tizen_6.0_base_hotfix/20201102.162701submit/tizen_6.0_base_hotfix/20201030.192501submit/tizen_6.0_base/20201029.184801accepted/tizen/base/20200113.070343accepted/tizen/6.0/base/tool/hotfix/20201102.090423accepted/tizen/6.0/base/tool/hotfix/20201030.125056accepted/tizen/6.0/base/tool/20201029.112303accepted/tizen/6.0/base/20230713.142939accepted/tizen/6.0/base/20201029.111037tizen_6.0_base_hotfixtizen_6.0_baseaccepted/tizen_6.0_base_tool_hotfixaccepted/tizen_6.0_base_toolaccepted/tizen_6.0_base
Change-Id: I149d722c1eb357f42b5916b75131c791b9a66125
-rw-r--r-- | ChangeLog | 44 | ||||
-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 | ||||
-rw-r--r-- | lib/stdio-impl.h | 6 |
7 files changed, 66 insertions, 8 deletions
@@ -1,3 +1,47 @@ +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 + Problem reported by Daniel P. Berrangé in: + https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.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): + Check _IO_EOF_SEEN instead of _IO_ftrylockfile. + * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: + Define if not already defined. + 2013-09-15 Gary V. Vaughan <gary@gnu.org> configury: specify subdir-objects for future automake releases. diff --git a/lib/fflush.c b/lib/fflush.c index 8ac5dea..5547d54 100644 --- a/lib/fflush.c +++ b/lib/fflush.c @@ -33,7 +33,8 @@ #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 @@ -71,7 +72,8 @@ clear_ungetc_buffer (FILE *fp) #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 __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_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); diff --git a/lib/fpurge.c b/lib/fpurge.c index e00187d..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_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 */ 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 f2dae46..3073717 100644 --- a/lib/freadahead.c +++ b/lib/freadahead.c @@ -25,7 +25,8 @@ size_t freadahead (FILE *fp) { -#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 (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 8012a7a..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_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 */ 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 c03be3d..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_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 (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_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 */ fp->_flags &= ~_IO_EOF_SEEN; fp->_offset = pos; #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 45291cf..89e26c1 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h @@ -18,6 +18,12 @@ the same implementation of stdio extension API, except that some fields have different naming conventions, or their access requires some casts. */ +/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this + problem by defining it ourselves. FIXME: Do not rely on glibc + internals. */ +#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN +# define _IO_IN_BACKUP 0x100 +#endif /* BSD stdio derived implementations. */ |