Mercurial > hg > octave-lojdl > gnulib-hg

changeset 13293:d6afdbe59f47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
freading: Adapt to special meaning of _IOREAD flag on Solaris.
author Bruno Haible <bruno@clisp.org>
date Sat, 01 May 2010 20:23:22 +0200
parents e37528fbf2ac
children 4263e09100fb
files ChangeLog lib/freading.c
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-01  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	Fix doc about a HP-UX stdio bug.
--- a/lib/freading.c
+++ b/lib/freading.c
@@ -40,7 +40,11 @@
 #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 */