Port extended stdio modules to HP NonStop Kernel.

* lib/stdio-impl.h (_IOERR, _IOREAD, _IOWRT, _IORW) [__TANDEM]: New
macros.
* lib/fbufmode.c: Update comments.
* lib/fflush.c: Likewise.
* lib/fpurge.c: Likewise.
* lib/freadable.c: Likewise.
* lib/freadahead.c: Likewise.
* lib/freading.c: Likewise.
* lib/freadptr.c: Likewise.
* lib/freadseek.c: Likewise.
* lib/fseeko.c: Likewise.
* lib/fseterr.c: Likewise.
* lib/fwritable.c: Likewise.
* lib/fwriting.c: Likewise.
Reported by Joachim Schmitz <jojo@schmitz-digital.de>.

diff --git a/ChangeLog b/ChangeLog
index c2141ed0ccb50f5d5b5406e0919f367eaa7a7b7d..e0e4e3afd361f486dbcc6c0b40e2ff0ffd69181e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-22  Bruno Haible  <bruno@clisp.org>
+
+       Port extended stdio modules to HP NonStop Kernel.
+       * lib/stdio-impl.h (_IOERR, _IOREAD, _IOWRT, _IORW) [__TANDEM]: New
+       macros.
+       * lib/fbufmode.c: Update comments.
+       * lib/fflush.c: Likewise.
+       * lib/fpurge.c: Likewise.
+       * lib/freadable.c: Likewise.
+       * lib/freadahead.c: Likewise.
+       * lib/freading.c: Likewise.
+       * lib/freadptr.c: Likewise.
+       * lib/freadseek.c: Likewise.
+       * lib/fseeko.c: Likewise.
+       * lib/fseterr.c: Likewise.
+       * lib/fwritable.c: Likewise.
+       * lib/fwriting.c: Likewise.
+       Reported by Joachim Schmitz <jojo@schmitz-digital.de>.
+
 2010-12-22  Bruno Haible  <bruno@clisp.org>
 
        ttyname_r: Work around bug on OSF/1 5.1.

diff --git a/lib/fbufmode.c b/lib/fbufmode.c
index 42a305b59d8ff25598748eda1a76437d6c7eca4a..1ccf0c4f9d04dfee747591e0c530b4e202d601e6 100644 (file)
--- a/lib/fbufmode.c
+++ b/lib/fbufmode.c
@@ -50,7 +50,7 @@ fbufmode (FILE *fp)
   return _IOFBF;
 #elif defined __EMX__               /* emx+gcc */
   return fp->_flags & (_IOLBF | _IONBF | _IOFBF);
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
 # if HAVE___FLBF                    /* Solaris >= 7 */
   if (__flbf (fp))
     return _IOLBF;

diff --git a/lib/fflush.c b/lib/fflush.c
index ead4875498e760bc572310d49d02131a1d902573..a84a0a25f8fb46432b6cf70127d5b36a2688de34 100644 (file)
--- a/lib/fflush.c
+++ b/lib/fflush.c
@@ -60,7 +60,7 @@ clear_ungetc_buffer (FILE *fp)
       fp->_ungetc_count = 0;
       fp->_rcount = - fp->_rcount;
     }
-# elif defined _IOERR               /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+# elif defined _IOERR               /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   /* Nothing to do.  */
 # else                              /* other implementations */
   fseeko (fp, 0, SEEK_CUR);

diff --git a/lib/fpurge.c b/lib/fpurge.c
index 079a2995acd57b2a30895c0b51730836a0574728..eaa6d2c53b4558885a9375b860c9366b24827755 100644 (file)
--- a/lib/fpurge.c
+++ b/lib/fpurge.c
@@ -91,7 +91,7 @@ fpurge (FILE *fp)
   fp->_wcount = 0;
   fp->_ungetc_count = 0;
   return 0;
-# elif defined _IOERR               /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+# elif defined _IOERR               /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   fp->_ptr = fp->_base;
   if (fp->_ptr != NULL)
     fp->_cnt = 0;

diff --git a/lib/freadable.c b/lib/freadable.c
index 9464408ba61de101719a22101d5eedb486ffe9c9..1ab3e53f03a4da8ac058d459353e60d02c45a391 100644 (file)
--- a/lib/freadable.c
+++ b/lib/freadable.c
@@ -33,7 +33,7 @@ freadable (FILE *fp)
   return (fp_->_flags & (__SRW | __SRD)) != 0;
 #elif defined __EMX__               /* emx+gcc */
   return (fp->_flags & (_IORW | _IOREAD)) != 0;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   return (fp->_flag & (_IORW | _IOREAD)) != 0;
 #elif defined __QNX__               /* QNX */
   return (fp->_Mode & 0x1 /* _MOPENR */) != 0;

diff --git a/lib/freadahead.c b/lib/freadahead.c
index 50ff27ee20a012c8d13c1a43cceaeb3c5098f77c..09424b80c40d1d1b7986e8bee38df69d2e52be94 100644 (file)
--- a/lib/freadahead.c
+++ b/lib/freadahead.c
@@ -48,7 +48,7 @@ freadahead (FILE *fp)
   /* equivalent to
      (fp->_ungetc_count == 0 ? fp->_rcount : fp->_ungetc_count - fp->_rcount) */
   return (fp->_rcount > 0 ? fp->_rcount : fp->_ungetc_count - fp->_rcount);
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   if ((fp_->_flag & _IOWRT) != 0)
     return 0;
   return fp_->_cnt;

diff --git a/lib/freading.c b/lib/freading.c
index 202c3f76c34f30dd1aa62f44de7200f7a706cdf0..4b8beeddab8c490c5fb0c9a36b6ad13fe85de15d 100644 (file)
--- a/lib/freading.c
+++ b/lib/freading.c
@@ -39,7 +39,7 @@ freading (FILE *fp)
   return (fp_->_flags & __SRD) != 0;
 #elif defined __EMX__               /* emx+gcc */
   return (fp->_flags & _IOREAD) != 0;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
 # if defined __sun                  /* Solaris */
   return (fp->_flag & _IOREAD) != 0 && (fp->_flag & _IOWRT) == 0;
 # else

diff --git a/lib/freadptr.c b/lib/freadptr.c
index 05f501bfeb34a8fadbfb810977a805f58748058e..2fcdf81cccaa87fc640a78da81ca76cb80f6e156 100644 (file)
--- a/lib/freadptr.c
+++ b/lib/freadptr.c
@@ -56,7 +56,7 @@ freadptr (FILE *fp, size_t *sizep)
     abort ();
   *sizep = fp->_rcount;
   return fp->_ptr;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   if ((fp_->_flag & _IOWRT) != 0)
     return NULL;
   size = fp_->_cnt;

diff --git a/lib/freadseek.c b/lib/freadseek.c
index 99af4370a1cd76b34f936525ff1e9624b6ea4462..11fad29997f52e052c825bf45bef3ad206edc463 100644 (file)
--- a/lib/freadseek.c
+++ b/lib/freadseek.c
@@ -42,7 +42,7 @@ freadptrinc (FILE *fp, size_t increment)
 #elif defined __EMX__               /* emx+gcc */
   fp->_ptr += increment;
   fp->_rcount -= increment;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   fp_->_ptr += increment;
   fp_->_cnt -= increment;
 #elif defined __UCLIBC__            /* uClibc */

diff --git a/lib/fseeko.c b/lib/fseeko.c
index 1fd1266bfe9726b604a037f59e7aacce84845938..f5359683ec1b84b21b25d8e8bc4b10dafc5836da 100644 (file)
--- a/lib/fseeko.c
+++ b/lib/fseeko.c
@@ -69,7 +69,7 @@ fseeko (FILE *fp, off_t offset, int whence)
       && fp->_rcount == 0
       && fp->_wcount == 0
       && fp->_ungetc_count == 0)
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   if (fp_->_ptr == fp_->_base
       && (fp_->_ptr == NULL || fp_->_cnt == 0))
 #elif defined __UCLIBC__            /* uClibc */
@@ -131,7 +131,7 @@ fseeko (FILE *fp, off_t offset, int whence)
       fp_->_flags &= ~__SEOF;
 #elif defined __EMX__               /* emx+gcc */
       fp->_flags &= ~_IOEOF;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
       fp->_flag &= ~_IOEOF;
 #elif defined __MINT__              /* Atari FreeMiNT */
       fp->__offset = pos;

diff --git a/lib/fseterr.c b/lib/fseterr.c
index b1a379ebba8de04a1adfac20f946d12deefbb655..f14d3c0470a87f3831b879f41ff66e5d90745573 100644 (file)
--- a/lib/fseterr.c
+++ b/lib/fseterr.c
@@ -35,7 +35,7 @@ fseterr (FILE *fp)
   fp_->_flags |= __SERR;
 #elif defined __EMX__               /* emx+gcc */
   fp->_flags |= _IOERR;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   fp_->_flag |= _IOERR;
 #elif defined __UCLIBC__            /* uClibc */
   fp->__modeflags |= __FLAG_ERROR;

diff --git a/lib/fwritable.c b/lib/fwritable.c
index a3f87958077751d64d693006fbb53fb8e1656181..5e2f4a60388d1dd60feb6b153404adf37d61f17a 100644 (file)
--- a/lib/fwritable.c
+++ b/lib/fwritable.c
@@ -33,7 +33,7 @@ fwritable (FILE *fp)
   return (fp_->_flags & (__SRW | __SWR)) != 0;
 #elif defined __EMX__               /* emx+gcc */
   return (fp->_flags & (_IORW | _IOWRT)) != 0;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   return (fp->_flag & (_IORW | _IOWRT)) != 0;
 #elif defined __QNX__               /* QNX */
   return (fp->_Mode & 0x2 /* _MOPENW */) != 0;

diff --git a/lib/fwriting.c b/lib/fwriting.c
index 12cd25e23d88135f227ab69d2d86fe3fe0bef7f0..5322e9f3b805b557e29e46a02e2abd35ec51a2ec 100644 (file)
--- a/lib/fwriting.c
+++ b/lib/fwriting.c
@@ -33,7 +33,7 @@ fwriting (FILE *fp)
   return (fp_->_flags & __SWR) != 0;
 #elif defined __EMX__               /* emx+gcc */
   return (fp->_flags & _IOWRT) != 0;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   return (fp->_flag & _IOWRT) != 0;
 #elif defined __UCLIBC__            /* uClibc */
   return (fp->__modeflags & __FLAG_WRITING) != 0;

diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
index 0e67f66ef6fd3670f111c0977163efb94ab25ee1..9f5cdfeeb318a9b71510667faf9a9058737030c2 100644 (file)
--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
@@ -75,6 +75,17 @@
 
 /* SystemV derived implementations.  */
 
+#ifdef __TANDEM                     /* NonStop Kernel */
+# ifndef _IOERR
+/* These values were determined by the program 'stdioext-flags' at
+   <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>.  */
+#  define _IOERR   0x40
+#  define _IOREAD  0x80
+#  define _IOWRT    0x4
+#  define _IORW   0x100
+# endif
+#endif
+
 #if defined _IOERR
 
 # if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */