# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1312946639 14400
# Node ID 1be5f06d9fa77a4e6d8ab122612db915d060f27c
# Parent  3509cf60d1f690444f418fa30ab590376dd35668# Parent  9a498efac5f146c62ea44f28a3816b949fd2aca4
maint: periodic merge of stable to default

diff --git a/build-aux/bootstrap.conf b/build-aux/bootstrap.conf
--- a/build-aux/bootstrap.conf
+++ b/build-aux/bootstrap.conf
@@ -25,6 +25,10 @@
   fcntl
   filemode
   fnmatch
+  fopen
+  fflush
+  fseek
+  ftell
   getcwd
   gethostname
   getopt-gnu
diff --git a/src/c-file-ptr-stream.cc b/src/c-file-ptr-stream.cc
--- a/src/c-file-ptr-stream.cc
+++ b/src/c-file-ptr-stream.cc
@@ -195,9 +195,7 @@
 int
 c_file_ptr_buf::seek (long offset, int origin)
 {
-  // gnulib::fseek doesn't seem to work, so don't use it until problem
-  // can be properly diagnosed and fixed.
-  return f ? fseek (f, offset, origin) : -1;
+  return f ? gnulib::fseek (f, offset, origin) : -1;
 }
 
 long
diff --git a/src/file-io.cc b/src/file-io.cc
--- a/src/file-io.cc
+++ b/src/file-io.cc
@@ -494,7 +494,7 @@
                 {
                   tmode.erase (pos, 1);
 
-                  FILE *fptr = ::fopen (fname.c_str (), tmode.c_str ());
+                  FILE *fptr = gnulib::fopen (fname.c_str (), tmode.c_str ());
 
                   int fd = fileno (fptr);
 
@@ -509,7 +509,7 @@
               else
 #endif
                 {
-                  FILE *fptr = ::fopen (fname.c_str (), tmode.c_str ());
+                  FILE *fptr = gnulib::fopen (fname.c_str (), tmode.c_str ());
 
                   retval = octave_stdiostream::create (fname, fptr, md, flt_fmt);
 
diff --git a/src/input.cc b/src/input.cc
--- a/src/input.cc
+++ b/src/input.cc
@@ -428,7 +428,7 @@
   FILE *instream = 0;
 
   if (name.length () > 0)
-    instream = fopen (name.c_str (), "rb");
+    instream = gnulib::fopen (name.c_str (), "rb");
 
   if (! instream && warn)
     warning ("%s: no such file or directory", name.c_str ());