X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffbufmode.c;h=5f659bfe91d4c2ec7e14ace8b911192a2f6e6e60;hb=bb2bf54fe80c58cf9ed9cb71447743060970d198;hp=58c3bc247a418d52b39dcb5e0c65e7e8e0121a41;hpb=555c3d668283df0cb7d4d29463db275cff9acecd;p=gnulib.git

diff --git a/lib/fbufmode.c b/lib/fbufmode.c
index 58c3bc247..5f659bfe9 100644
--- a/lib/fbufmode.c
+++ b/lib/fbufmode.c
@@ -1,19 +1,18 @@
 /* Retrieve information about a FILE stream.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -55,8 +54,15 @@ fbufmode (FILE *fp)
   if (fp->_flag & _IOLBF)
     return _IOLBF;
 # endif
-# if defined __sun && defined __sparc && defined _LP64 /* Solaris/SPARC 64-bit */
-  return ((unsigned int *) fp) [9] & (_IONBF | _IOFBF);
+# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */
+#  define fp_ ((struct { unsigned char *_ptr; \
+			 unsigned char *_base; \
+			 unsigned char *_end; \
+			 long _cnt; \
+			 int _file; \
+			 unsigned int _flag; \
+		       } *) fp)
+  return fp_->_flag & (_IONBF | _IOFBF);
 # else
   if (fp->_flag & _IONBF)
     return _IONBF;
@@ -68,6 +74,12 @@ fbufmode (FILE *fp)
   if (fp->__modeflags & __FLAG_NBF)
     return _IONBF;
   return _IOFBF;
+#elif defined __QNX__               /* QNX */
+  if (fp->_Mode & 0x400 /* _MLBF */)
+    return _IOLBF;
+  if (fp->_Mode & 0x800 /* _MNBF */)
+    return _IONBF;
+  return _IOFBF;
 #else
  #error "Please port gnulib fbufmode.c to your platform! Look at the setvbuf implementation."
 #endif