| | diff -r -U3 coreutils-6.12/lib/freadahead.c coreutils-6.12-patched/lib/freadahead.c |
| | |
| | |
| | @@ -24,7 +24,7 @@ |
| | size_t |
| | freadahead (FILE *fp) |
| | { |
| | -#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ |
| | +#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ |
| | if (fp->_IO_write_ptr > fp->_IO_write_base) |
| | return 0; |
| | return (fp->_IO_read_end - fp->_IO_read_ptr) |
| | diff -r -U3 coreutils-6.12/lib/freadptr.c coreutils-6.12-patched/lib/freadptr.c |
| | |
| | |
| | @@ -29,7 +29,7 @@ |
| | size_t size; |
| |
|
| | /* Keep this code in sync with freadahead! */ |
| | -#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ |
| | +#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ |
| | if (fp->_IO_write_ptr > fp->_IO_write_base) |
| | return NULL; |
| | size = fp->_IO_read_end - fp->_IO_read_ptr; |
| | diff -r -U3 coreutils-6.12/lib/freadseek.c coreutils-6.12-patched/lib/freadseek.c |
| | |
| | |
| | @@ -34,7 +34,7 @@ |
| | freadptrinc (FILE *fp, size_t increment) |
| | { |
| | /* Keep this code in sync with freadptr! */ |
| | -#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ |
| | +#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ |
| | fp->_IO_read_ptr += increment; |
| | #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ |
| | fp_->_p += increment; |
| | diff -r -U3 coreutils-6.12/lib/fseterr.c coreutils-6.12-patched/lib/fseterr.c |
| | |
| | |
| | @@ -29,7 +29,7 @@ |
| | /* 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_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ |
| | +#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ |
| | fp->_flags |= _IO_ERR_SEEN; |
| | #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ |
| | fp_->_flags |= __SERR; |
| | diff -r -U3 coreutils-6.12/lib/stdio-impl.h coreutils-6.12-patched/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. */ |
| |
|