Re: fseeko broken by Fedora rawhide glibc / git master (ie future 2.28)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Mar 05, 2018 at 11:00:40AM -0800, Paul Eggert wrote:
> On 03/05/2018 04:19 AM, Daniel P. Berrangé wrote:
> > I'm curious why we're trying to replace fseeko impl at all, since I
> > would expect the modern glibc impl to be suitable to use as-is.
> 
> It's to work around glibc bug#12799, a longstanding bug with ungetc and
> fflush. See the bug-gnulib thread that starts here:
> 
> https://lists.gnu.org/r/bug-gnulib/2009-01/msg00067.html
> 
> Any chance of getting that glibc bug fixed in glibc 2.28? That should avoid
> the problem with Gnulib, and would be a good thing in its own right. In the
> meantime, the attached Gnulib patch is intended to work around the bug from
> the Gnulib side; does it work for you? (I haven't tried it on rawhide.)

Yes, this worked on rawhide when I tested with libvirt. Though note that
libvirt doesn't pull in all of the files you've changed here, so my test
hasn't validated everything.


> From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001
> From: Paul Eggert <eggert@xxxxxxxxxxx>
> Date: Mon, 5 Mar 2018 10:56:29 -0800
> Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> 
> 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.
> ---
>  ChangeLog        | 23 +++++++++++++++++++++++
>  lib/fbufmode.c   |  2 +-
>  lib/fflush.c     |  6 +++---
>  lib/fpending.c   |  2 +-
>  lib/fpurge.c     |  2 +-
>  lib/freadable.c  |  2 +-
>  lib/freadahead.c |  2 +-
>  lib/freading.c   |  2 +-
>  lib/freadptr.c   |  2 +-
>  lib/freadseek.c  |  2 +-
>  lib/fseeko.c     |  4 ++--
>  lib/fseterr.c    |  2 +-
>  lib/fwritable.c  |  2 +-
>  lib/fwriting.c   |  2 +-
>  lib/stdio-impl.h |  6 ++++++
>  15 files changed, 45 insertions(+), 16 deletions(-)
> 
> diff --git a/ChangeLog b/ChangeLog
> index 667f91663..beb835670 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,26 @@
> +2018-03-05  Paul Eggert  <eggert@xxxxxxxxxxx>
> +
> +	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.
> +
>  2018-02-27  Paul Eggert  <eggert@xxxxxxxxxxx>
>  
>  	environ: fix link error on 32-bit Cygwin
> diff --git a/lib/fbufmode.c b/lib/fbufmode.c
> index 73aa5fc07..f711fdfb7 100644
> --- a/lib/fbufmode.c
> +++ b/lib/fbufmode.c
> @@ -31,7 +31,7 @@ fbufmode (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>  # if HAVE___FLBF                    /* glibc >= 2.2 */
>    if (__flbf (fp))
>      return _IOLBF;
> diff --git a/lib/fflush.c b/lib/fflush.c
> index 983ade0ff..a6edfa105 100644
> --- a/lib/fflush.c
> +++ b/lib/fflush.c
> @@ -33,7 +33,7 @@
>  #undef fflush
>  
>  
> -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
> +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>  
>  /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
>  static void
> @@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
>  
>  #endif
>  
> -#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
> +#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
>  
>  # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
>  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
> @@ -148,7 +148,7 @@ 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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>  
>    clear_ungetc_buffer_preserving_position (stream);
>  
> diff --git a/lib/fpending.c b/lib/fpending.c
> index c84e3a5b4..789f50e4e 100644
> --- a/lib/fpending.c
> +++ b/lib/fpending.c
> @@ -32,7 +32,7 @@ __fpending (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>    return fp->_IO_write_ptr - fp->_IO_write_base;
>  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
> diff --git a/lib/fpurge.c b/lib/fpurge.c
> index b1d417c7a..3aedcc373 100644
> --- a/lib/fpurge.c
> +++ b/lib/fpurge.c
> @@ -62,7 +62,7 @@ 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 || __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/freadable.c b/lib/freadable.c
> index 03b50e186..c4ca0b86e 100644
> --- a/lib/freadable.c
> +++ b/lib/freadable.c
> @@ -31,7 +31,7 @@ freadable (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>    return (fp->_flags & _IO_NO_READS) == 0;
>  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
> diff --git a/lib/freadahead.c b/lib/freadahead.c
> index c2ecb5b28..23ec76ee5 100644
> --- a/lib/freadahead.c
> +++ b/lib/freadahead.c
> @@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
>  size_t
>  freadahead (FILE *fp)
>  {
> -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
> +#if defined _IO_EOF_SEEN || __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 73c28acdd..c24d0c88a 100644
> --- a/lib/freading.c
> +++ b/lib/freading.c
> @@ -31,7 +31,7 @@ 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 || __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/freadptr.c b/lib/freadptr.c
> index 5aeadf3da..ffb801039 100644
> --- a/lib/freadptr.c
> +++ b/lib/freadptr.c
> @@ -29,7 +29,7 @@ freadptr (FILE *fp, size_t *sizep)
>    size_t size;
>  
>    /* Keep this code in sync with freadahead!  */
> -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
> +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>    if (fp->_IO_write_ptr > fp->_IO_write_base)
>      return NULL;
>    size = fp->_IO_read_end - fp->_IO_read_ptr;
> diff --git a/lib/freadseek.c b/lib/freadseek.c
> index e7b0c7bdb..5fd2dd7ca 100644
> --- a/lib/freadseek.c
> +++ b/lib/freadseek.c
> @@ -36,7 +36,7 @@ freadptrinc (FILE *fp, size_t increment)
>    /* Keep this code in sync with freadptr!  */
>  #if HAVE___FREADPTRINC              /* musl libc */
>    __freadptrinc (fp, increment);
> -#elif defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
> +#elif defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>    fp->_IO_read_ptr += increment;
>  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
> diff --git a/lib/fseeko.c b/lib/fseeko.c
> index 0101ab55f..193f4e8ce 100644
> --- a/lib/fseeko.c
> +++ b/lib/fseeko.c
> @@ -47,7 +47,7 @@ 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 || __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)
> @@ -123,7 +123,7 @@ 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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>        fp->_flags &= ~_IO_EOF_SEEN;
>        fp->_offset = pos;
>  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
> diff --git a/lib/fseterr.c b/lib/fseterr.c
> index 82649c3ac..adb637256 100644
> --- a/lib/fseterr.c
> +++ b/lib/fseterr.c
> @@ -29,7 +29,7 @@ fseterr (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>    fp->_flags |= _IO_ERR_SEEN;
>  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
> diff --git a/lib/fwritable.c b/lib/fwritable.c
> index 981382163..3b1a380ec 100644
> --- a/lib/fwritable.c
> +++ b/lib/fwritable.c
> @@ -31,7 +31,7 @@ fwritable (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>    return (fp->_flags & _IO_NO_WRITES) == 0;
>  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
> diff --git a/lib/fwriting.c b/lib/fwriting.c
> index 461ab0f1f..4a3d9c8d4 100644
> --- a/lib/fwriting.c
> +++ b/lib/fwriting.c
> @@ -27,7 +27,7 @@ fwriting (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>    return (fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) != 0;
>  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
> diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
> index 78d896e9f..05c5752a2 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.  */
>  
> -- 
> 2.14.3
> 


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux