From 2d0c228f339519d2353cd1e4847aeb185f329d2b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 1 May 2010 20:23:22 +0200 Subject: [PATCH] freading: Adapt to special meaning of _IOREAD flag on Solaris. --- ChangeLog | 6 ++++++ lib/freading.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6f413790c..254b5f1cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-05-01 Bruno Haible + freading: Adapt to special meaning of _IOREAD flag on Solaris. + * lib/freading.c (freading): On Solaris, ignore the _IOREAD flag if + the _IOWRT flag is also set. + +2010-05-01 Bruno Haible + Fix doc about a HP-UX stdio bug. * doc/posix-functions/ftell.texi: Mark HP-UX bug as unfixed. * doc/posix-functions/ftello.texi: Likewise. diff --git a/lib/freading.c b/lib/freading.c index faca60e10..bb78a1bcb 100644 --- a/lib/freading.c +++ b/lib/freading.c @@ -40,7 +40,11 @@ freading (FILE *fp) #elif defined __EMX__ /* emx+gcc */ return (fp->_flags & _IOREAD) != 0; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ +# if defined __sun /* Solaris */ + return (fp->_flag & _IOREAD) != 0 && (fp->_flag & _IOWRT) == 0; +# else return (fp->_flag & _IOREAD) != 0; +# endif #elif defined __UCLIBC__ /* uClibc */ return (fp->__modeflags & (__FLAG_READONLY | __FLAG_READING)) != 0; #elif defined __QNX__ /* QNX */ -- 2.11.0