1-in.cc: New.

2003-06-30  Benjamin Kosnik  <bkoz@redhat.com>

	* 27_io/basic_filebuf/seekoff/char/1-in.cc: New.
	* 27_io/basic_filebuf/seekoff/char/1-io.cc: New.
	* 27_io/basic_filebuf/seekoff/char/1-out.cc: New.
	* 27_io/basic_filebuf/seekoff/char/2-in.cc: New.
	* 27_io/basic_filebuf/seekoff/char/2-io.cc: New.
	* 27_io/basic_filebuf/seekoff/char/2-out.cc: New.
	* 27_io/basic_filebuf/seekoff/char/2.cc: Remove.
	* 27_io/basic_filebuf/seekoff/char/3-in.cc: New.
	* 27_io/basic_filebuf/seekoff/char/3-io.cc: Change.
	* 27_io/basic_filebuf/seekoff/char/3-out.cc: New.
	* 27_io/basic_filebuf/seekoff/char/4-io.cc: Remove.
	* 27_io/basic_filebuf/seekpos/char/1-in.cc: New.
	* 27_io/basic_filebuf/seekpos/char/1-io.cc: New.
	* 27_io/basic_filebuf/seekpos/char/1-out.cc: New.
	* 27_io/basic_filebuf/seekpos/char/2-in.cc: New.
	* 27_io/basic_filebuf/seekpos/char/2-io.cc: New.
	* 27_io/basic_filebuf/seekpos/char/2-out.cc: New.
	* 27_io/basic_filebuf/seekpos/char/2.cc: Change.
	* 27_io/basic_filebuf/seekpos/char/3-in.cc: New.
	* 27_io/basic_filebuf/seekpos/char/3-io.cc: Remove.
	* 27_io/basic_filebuf/seekpos/char/3-out.cc: New.
	* 27_io/basic_filebuf/seekpos/char/4-io.cc: Remove.
 	* data/seekoff-1.tst: Remove.
	* data/seekoff-1io.tst: New.
	* data/seekoff-1out.tst: New.
	* data/seekoff-2.tst: Remove.
	* data/seekoff-2io.tst: New.
	* data/seekoff-2out.tst: New.
	* data/seekoff.txt
	* data/seekpos-1.tst: Remove.
	* data/seekpos-1io.tst: New.
	* data/seekpos-1out.tst: New.
	* data/seekpos-2.tst: Remove.
	* data/seekpos-2io.tst: New.
	* data/seekpos-2out.tst: New.
	* data/seekpos.txt: New.

From-SVN: r68757

9 files changed, 752 insertions, 128 deletions

diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc
new file mode 100644
index 00000000000..62173d0c843
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc
@@ -0,0 +1,124 @@
+// 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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.
+
+// This library 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 library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+#include <testsuite_io.h>
+
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %*.txt
+
+const char name_01[] = "seekoff.txt";
+
+void test05() 
+{
+  using namespace std;
+  using namespace __gnu_cxx_test;
+
+  typedef filebuf::int_type 	int_type;
+  typedef filebuf::pos_type 	pos_type;
+  typedef filebuf::off_type 	off_type;
+  typedef filebuf::traits_type 	traits_type;
+
+  bool 				test = true;
+  streamsize 			strmsz_1, strmsz_2;
+  streamoff  			strmof_1, strmof_2;
+
+  int_type c1;
+  int_type c2;
+  int_type c3;
+
+  pos_type pt_1(off_type(-1));
+  pos_type pt_2(off_type(0));
+  off_type off_1 = 0;
+  off_type off_2 = 0;
+
+  // seekoff
+  // pubseekoff(off_type off, ios_base::seekdir way, ios_base::openmode which)
+  // alters the stream position to off
+
+  // in
+  {
+    constraint_filebuf fb;
+    fb.open(name_01, ios_base::in);
+    VERIFY( !fb.write_position() );
+
+    //beg
+    strmsz_1 = fb.in_avail(); 
+    pt_1 = fb.pubseekoff(2, ios_base::beg);
+    strmsz_2 = fb.in_avail(); 
+    off_1 = pt_1;
+    VERIFY( off_1 > 0 );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == '9' );
+    fb.pubseekoff(3, ios_base::beg);
+    c2 = fb.sputc('\n');  //current in pointer +1
+    fb.pubseekoff(4, ios_base::beg);
+    c3 = fb.sgetc();
+    VERIFY( c2 == traits_type::eof() ); 
+    VERIFY( c3 == '9' );
+    fb.pubsync(); 
+    c1 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //cur
+    pt_2 = fb.pubseekoff(2, ios_base::cur);
+    off_2 = pt_2;
+    VERIFY( (off_2 == (off_1 + 2 + 1 + 1)) );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == '1' );
+    fb.pubseekoff(0, ios_base::cur);
+    c2 = fb.sputc('x');  //test current out pointer
+    c3 = fb.sputc('\n');
+    VERIFY( c2 == traits_type::eof() );
+    VERIFY( c3 == traits_type::eof() );
+    fb.pubseekoff(0, ios_base::cur);
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //end
+    pt_2 = fb.pubseekoff(0, ios_base::end);
+    off_1 = pt_2;
+    VERIFY( off_1 > off_2 ); //weak, but don't know exactly where it ends
+    c3 = fb.sputc('\n');
+    strmsz_1 = fb.sputn("because because because. . .", 28);  
+    VERIFY( strmsz_1 == 0 );
+    fb.pubseekoff(-1, ios_base::end);
+    fb.sgetc();
+    c1 = fb.sungetc();
+    // Defect?  retval of sungetc is not necessarily the character ungotten.
+    // So re-get it.
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+    VERIFY( !fb.write_position() );
+  }
+}
+
+main() 
+{
+  test05();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/4-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc
index d6352473867..00872f4117d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/4-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc
@@ -27,7 +27,7 @@
 // @require@ %-*.tst %-*.txt
 // @diff@ %-*.tst %*.txt
 
-const char name_01[] = "seekoff-2.tst";
+const char name_01[] = "seekoff-1io.tst";
 
 void test05() 
 {
@@ -38,7 +38,7 @@ void test05()
   typedef filebuf::pos_type 	pos_type;
   typedef filebuf::off_type 	off_type;
 
-  bool				test = true;
+  bool 				test = true;
   streamsize 			strmsz_1, strmsz_2;
   streamoff  			strmof_1, strmof_2;
 
@@ -57,61 +57,62 @@ void test05()
 
   // in | out
   {
-    constraint_filebuf fb_03;
-    fb_03.pubsetbuf(0, 0);
-    fb_03.open(name_01, ios_base::out | ios_base::in);
-    VERIFY( fb_03.unbuffered() );
-    // 27filebuf-3.txt = bd23456789:;<=>?...
+    constraint_filebuf fb;
+    fb.open(name_01, ios_base::out | ios_base::in);
+    VERIFY( !fb.write_position() );
+    VERIFY( !fb.read_position() );
+
     //beg
-    strmsz_1 = fb_03.in_avail(); 
-    pt_1 = fb_03.pubseekoff(2, ios_base::beg);
-    strmsz_2 = fb_03.in_avail(); 
+    strmsz_1 = fb.in_avail(); 
+    pt_1 = fb.pubseekoff(2, ios_base::beg);
+    strmsz_2 = fb.in_avail(); 
     off_1 = pt_1;
     VERIFY( off_1 > 0 );
-    c1 = fb_03.snextc(); //current in pointer +1
+    c1 = fb.snextc(); //current in pointer +1
     VERIFY( c1 == '9' );
-    fb_03.pubseekoff(3, ios_base::beg);
-    c2 = fb_03.sputc('\n');  //current in pointer +1
-    fb_03.pubseekoff(4, ios_base::beg);
-    c3 = fb_03.sgetc();
+    fb.pubseekoff(3, ios_base::beg);
+    c2 = fb.sputc('\n');  //current in pointer +1
+    fb.pubseekoff(4, ios_base::beg);
+    c3 = fb.sgetc();
     VERIFY( c2 != c3 ); 
     VERIFY( c3 == '9' );
-    fb_03.pubsync(); 
-    c1 = fb_03.sgetc();
+    fb.pubsync(); 
+    c1 = fb.sgetc();
     VERIFY( c1 == c3 );
+
     //cur
-    // 27filebuf-3.txt = bd2\n456789:;<=>?...
-    pt_2 = fb_03.pubseekoff(2, ios_base::cur);
+    pt_2 = fb.pubseekoff(2, ios_base::cur);
     off_2 = pt_2;
     VERIFY( (off_2 == (off_1 + 2 + 1 + 1)) );
-    c1 = fb_03.snextc(); //current in pointer +1
+    c1 = fb.snextc(); //current in pointer +1
     VERIFY( c1 == '1' );
-    fb_03.pubseekoff(0, ios_base::cur);
-    c2 = fb_03.sputc('x');  //test current out pointer
-    c3 = fb_03.sputc('\n');
-    fb_03.pubseekoff(0, ios_base::cur);
-    c1 = fb_03.sgetc();
-    fb_03.pubsync(); 
-    c3 = fb_03.sgetc();
+    fb.pubseekoff(0, ios_base::cur);
+    c2 = fb.sputc('x');  //test current out pointer
+    c3 = fb.sputc('\n');
+    fb.pubseekoff(0, ios_base::cur);
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
     VERIFY( c1 == c3 );
+
     //end
-    // 27filebuf-3.txt = "bd2\n456x\n9" 
-    pt_2 = fb_03.pubseekoff(0, ios_base::end);
+    pt_2 = fb.pubseekoff(0, ios_base::end);
     off_1 = pt_2;
     VERIFY( off_1 > off_2 ); //weak, but don't know exactly where it ends
-    c3 = fb_03.sputc('\n');
-    strmsz_1 = fb_03.sputn("because because because. . .", 28);  
+    c3 = fb.sputc('\n');
+    strmsz_1 = fb.sputn("because because because. . .", 28);  
     VERIFY( strmsz_1 == 28 );
-    fb_03.pubseekoff(-1, ios_base::end);
-    fb_03.sgetc();
-    c1 = fb_03.sungetc();
+    fb.pubseekoff(-1, ios_base::end);
+    fb.sgetc();
+    c1 = fb.sungetc();
     // Defect?  retval of sungetc is not necessarily the character ungotten.
     // So re-get it.
-    c1 = fb_03.sgetc();
-    fb_03.pubsync(); 
-    c3 = fb_03.sgetc();
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
     VERIFY( c1 == c3 );
-    VERIFY( fb_03.unbuffered() );
+    VERIFY( !fb.write_position() );
+    VERIFY( fb.read_position() );
   }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc
new file mode 100644
index 00000000000..39abdac89d3
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc
@@ -0,0 +1,124 @@
+// 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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.
+
+// This library 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 library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+#include <testsuite_io.h>
+
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %*.txt
+
+const char name_01[] = "seekoff-1out.tst";
+
+void test05() 
+{
+  using namespace std;
+  using namespace __gnu_cxx_test;
+
+  typedef filebuf::int_type 	int_type;
+  typedef filebuf::pos_type 	pos_type;
+  typedef filebuf::off_type 	off_type;
+  typedef filebuf::traits_type 	traits_type;
+
+  bool 				test = true;
+  streamsize 			strmsz_1, strmsz_2;
+  streamoff  			strmof_1, strmof_2;
+
+  int_type c1;
+  int_type c2;
+  int_type c3;
+
+  pos_type pt_1(off_type(-1));
+  pos_type pt_2(off_type(0));
+  off_type off_1 = 0;
+  off_type off_2 = 0;
+
+  // seekoff
+  // pubseekoff(off_type off, ios_base::seekdir way, ios_base::openmode which)
+  // alters the stream position to off
+
+  // out
+  {
+    constraint_filebuf fb;
+    fb.open(name_01, ios_base::out);
+    VERIFY( !fb.write_position() );
+    VERIFY( !fb.read_position() );
+
+    //beg
+    strmsz_1 = fb.in_avail(); 
+    pt_1 = fb.pubseekoff(2, ios_base::beg);
+    strmsz_2 = fb.in_avail(); 
+    off_1 = pt_1;
+    VERIFY( off_1 > 0 );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == traits_type::eof() );
+    fb.pubseekoff(3, ios_base::beg);
+    c2 = fb.sputc('\n');  //current in pointer +1
+    fb.pubseekoff(4, ios_base::beg);
+    c3 = fb.sgetc();
+    VERIFY( c2 != c3 ); 
+    VERIFY( c3 == traits_type::eof() );
+    fb.pubsync(); 
+    c1 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //cur
+    pt_2 = fb.pubseekoff(2, ios_base::cur);
+    off_2 = pt_2;
+    VERIFY( (off_2 == (off_1 + 2 + 1 + 1)) );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == traits_type::eof() );
+    fb.pubseekoff(0, ios_base::cur);
+    c2 = fb.sputc('x');  //test current out pointer
+    c3 = fb.sputc('\n');
+    fb.pubseekoff(0, ios_base::cur);
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //end
+    pt_2 = fb.pubseekoff(0, ios_base::end);
+    off_1 = pt_2;
+    VERIFY( off_1 > off_2 ); //weak, but don't know exactly where it ends
+    c3 = fb.sputc('\n');
+    strmsz_1 = fb.sputn("because because because. . .", 28);  
+    VERIFY( strmsz_1 == 28 );
+    fb.pubseekoff(-1, ios_base::end);
+    fb.sgetc();
+    c1 = fb.sungetc();
+    // Defect?  retval of sungetc is not necessarily the character ungotten.
+    // So re-get it.
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+    VERIFY( !fb.write_position() );
+    VERIFY( !fb.read_position() );
+  }
+}
+
+main() 
+{
+  test05();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc
new file mode 100644
index 00000000000..0dc97ded28a
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc
@@ -0,0 +1,125 @@
+// 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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.
+
+// This library 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 library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+#include <testsuite_io.h>
+
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %*.txt
+
+const char name_01[] = "seekoff.txt";
+
+void test05() 
+{
+  using namespace std;
+  using namespace __gnu_cxx_test;
+
+  typedef filebuf::int_type 	int_type;
+  typedef filebuf::pos_type 	pos_type;
+  typedef filebuf::off_type 	off_type;
+  typedef filebuf::traits_type 	traits_type;
+
+  bool 				test = true;
+  streamsize 			strmsz_1, strmsz_2;
+  streamoff  			strmof_1, strmof_2;
+
+  int_type c1;
+  int_type c2;
+  int_type c3;
+
+  pos_type pt_1(off_type(-1));
+  pos_type pt_2(off_type(0));
+  off_type off_1 = 0;
+  off_type off_2 = 0;
+
+  // seekoff
+  // pubseekoff(off_type off, ios_base::seekdir way, ios_base::openmode which)
+  // alters the stream position to off
+
+  // in
+  {
+    constraint_filebuf fb;
+    fb.pubsetbuf(0, 0);
+    fb.open(name_01, ios_base::in);
+    VERIFY( fb.unbuffered() );
+
+    //beg
+    strmsz_1 = fb.in_avail(); 
+    pt_1 = fb.pubseekoff(2, ios_base::beg);
+    strmsz_2 = fb.in_avail(); 
+    off_1 = pt_1;
+    VERIFY( off_1 > 0 );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == '9' );
+    fb.pubseekoff(3, ios_base::beg);
+    c2 = fb.sputc('\n');  //current in pointer +1
+    fb.pubseekoff(4, ios_base::beg);
+    c3 = fb.sgetc();
+    VERIFY( c2 == traits_type::eof() ); 
+    VERIFY( c3 == '9' );
+    fb.pubsync(); 
+    c1 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //cur
+    pt_2 = fb.pubseekoff(2, ios_base::cur);
+    off_2 = pt_2;
+    VERIFY( (off_2 == (off_1 + 2 + 1 + 1)) );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == '1' );
+    fb.pubseekoff(0, ios_base::cur);
+    c2 = fb.sputc('x');  //test current out pointer
+    c3 = fb.sputc('\n');
+    VERIFY( c2 == traits_type::eof() );
+    VERIFY( c3 == traits_type::eof() );
+    fb.pubseekoff(0, ios_base::cur);
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //end
+    pt_2 = fb.pubseekoff(0, ios_base::end);
+    off_1 = pt_2;
+    VERIFY( off_1 > off_2 ); //weak, but don't know exactly where it ends
+    c3 = fb.sputc('\n');
+    strmsz_1 = fb.sputn("because because because. . .", 28);  
+    VERIFY( strmsz_1 == 0 );
+    fb.pubseekoff(-1, ios_base::end);
+    fb.sgetc();
+    c1 = fb.sungetc();
+    // Defect?  retval of sungetc is not necessarily the character ungotten.
+    // So re-get it.
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+    VERIFY( fb.unbuffered() );
+  }
+}
+
+main() 
+{
+  test05();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc
new file mode 100644
index 00000000000..8be6f5e7adf
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc
@@ -0,0 +1,122 @@
+// 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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.
+
+// This library 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 library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+#include <testsuite_io.h>
+
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %*.txt
+
+const char name_01[] = "seekoff-2io.tst";
+
+void test05() 
+{
+  using namespace std;
+  using namespace __gnu_cxx_test;
+
+  typedef filebuf::int_type 	int_type;
+  typedef filebuf::pos_type 	pos_type;
+  typedef filebuf::off_type 	off_type;
+
+  bool 				test = true;
+  streamsize 			strmsz_1, strmsz_2;
+  streamoff  			strmof_1, strmof_2;
+
+  int_type c1;
+  int_type c2;
+  int_type c3;
+
+  pos_type pt_1(off_type(-1));
+  pos_type pt_2(off_type(0));
+  off_type off_1 = 0;
+  off_type off_2 = 0;
+
+  // seekoff
+  // pubseekoff(off_type off, ios_base::seekdir way, ios_base::openmode which)
+  // alters the stream position to off
+
+  // in | out
+  {
+    constraint_filebuf fb;
+    fb.pubsetbuf(0, 0);
+    fb.open(name_01, ios_base::out | ios_base::in);
+    VERIFY( fb.unbuffered() );
+
+    //beg
+    strmsz_1 = fb.in_avail(); 
+    pt_1 = fb.pubseekoff(2, ios_base::beg);
+    strmsz_2 = fb.in_avail(); 
+    off_1 = pt_1;
+    VERIFY( off_1 > 0 );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == '9' );
+    fb.pubseekoff(3, ios_base::beg);
+    c2 = fb.sputc('\n');  //current in pointer +1
+    fb.pubseekoff(4, ios_base::beg);
+    c3 = fb.sgetc();
+    VERIFY( c2 != c3 ); 
+    VERIFY( c3 == '9' );
+    fb.pubsync(); 
+    c1 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //cur
+    pt_2 = fb.pubseekoff(2, ios_base::cur);
+    off_2 = pt_2;
+    VERIFY( (off_2 == (off_1 + 2 + 1 + 1)) );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == '1' );
+    fb.pubseekoff(0, ios_base::cur);
+    c2 = fb.sputc('x');  //test current out pointer
+    c3 = fb.sputc('\n');
+    fb.pubseekoff(0, ios_base::cur);
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //end
+    pt_2 = fb.pubseekoff(0, ios_base::end);
+    off_1 = pt_2;
+    VERIFY( off_1 > off_2 ); //weak, but don't know exactly where it ends
+    c3 = fb.sputc('\n');
+    strmsz_1 = fb.sputn("because because because. . .", 28);  
+    VERIFY( strmsz_1 == 28 );
+    fb.pubseekoff(-1, ios_base::end);
+    fb.sgetc();
+    c1 = fb.sungetc();
+    // Defect?  retval of sungetc is not necessarily the character ungotten.
+    // So re-get it.
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+    VERIFY( fb.unbuffered() );
+  }
+}
+
+main() 
+{
+  test05();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc
new file mode 100644
index 00000000000..4a39a2164f3
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc
@@ -0,0 +1,123 @@
+// 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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.
+
+// This library 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 library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+#include <testsuite_io.h>
+
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %*.txt
+
+const char name_01[] = "seekoff-2out.tst";
+
+void test05() 
+{
+  using namespace std;
+  using namespace __gnu_cxx_test;
+
+  typedef filebuf::int_type 	int_type;
+  typedef filebuf::pos_type 	pos_type;
+  typedef filebuf::off_type 	off_type;
+  typedef filebuf::traits_type 	traits_type;
+
+  bool 				test = true;
+  streamsize 			strmsz_1, strmsz_2;
+  streamoff  			strmof_1, strmof_2;
+
+  int_type c1;
+  int_type c2;
+  int_type c3;
+
+  pos_type pt_1(off_type(-1));
+  pos_type pt_2(off_type(0));
+  off_type off_1 = 0;
+  off_type off_2 = 0;
+
+  // seekoff
+  // pubseekoff(off_type off, ios_base::seekdir way, ios_base::openmode which)
+  // alters the stream position to off
+
+  // out
+  {
+    constraint_filebuf fb;
+    fb.pubsetbuf(0, 0);
+    fb.open(name_01, ios_base::out);
+    VERIFY( fb.unbuffered() );
+
+    //beg
+    strmsz_1 = fb.in_avail(); 
+    pt_1 = fb.pubseekoff(2, ios_base::beg);
+    strmsz_2 = fb.in_avail(); 
+    off_1 = pt_1;
+    VERIFY( off_1 > 0 );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == traits_type::eof() );
+    fb.pubseekoff(3, ios_base::beg);
+    c2 = fb.sputc('\n');  //current in pointer +1
+    fb.pubseekoff(4, ios_base::beg);
+    c3 = fb.sgetc();
+    VERIFY( c2 != c3 ); 
+    VERIFY( c3 == traits_type::eof() );
+    fb.pubsync(); 
+    c1 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //cur
+    pt_2 = fb.pubseekoff(2, ios_base::cur);
+    off_2 = pt_2;
+    VERIFY( (off_2 == (off_1 + 2 + 1 + 1)) );
+    c1 = fb.snextc(); //current in pointer +1
+    VERIFY( c1 == traits_type::eof() );
+    fb.pubseekoff(0, ios_base::cur);
+    c2 = fb.sputc('x');  //test current out pointer
+    c3 = fb.sputc('\n');
+    fb.pubseekoff(0, ios_base::cur);
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+
+    //end
+    pt_2 = fb.pubseekoff(0, ios_base::end);
+    off_1 = pt_2;
+    VERIFY( off_1 > off_2 ); //weak, but don't know exactly where it ends
+    c3 = fb.sputc('\n');
+    strmsz_1 = fb.sputn("because because because. . .", 28);  
+    VERIFY( strmsz_1 == 28 );
+    fb.pubseekoff(-1, ios_base::end);
+    fb.sgetc();
+    c1 = fb.sungetc();
+    // Defect?  retval of sungetc is not necessarily the character ungotten.
+    // So re-get it.
+    c1 = fb.sgetc();
+    fb.pubsync(); 
+    c3 = fb.sgetc();
+    VERIFY( c1 == c3 );
+    VERIFY( fb.unbuffered() );
+  }
+}
+
+main() 
+{
+  test05();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc
index fa185521d33..b0a192d2337 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc
@@ -52,7 +52,6 @@ int main()
 {
   using namespace std;
 
-  // movie star, submarine scientist!
   filebuf in1;
   in1.open(name_01, ios_base::in);
   filebuf in2;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
index d310d513871..df03ad6cae2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
@@ -18,106 +18,48 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-// 27.8.1.4 Overridden virtual functions
+// 27.7.1.3 Overridden virtual functions
 
 #include <fstream>
 #include <testsuite_hooks.h>
-#include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
-const char name_01[] = "seekoff-1.tst";
-
-void test05() 
+void test02(std::filebuf& in, bool pass)
 {
+  bool test = true;
   using namespace std;
-  using namespace __gnu_cxx_test;
-
-  typedef filebuf::int_type 	int_type;
-  typedef filebuf::pos_type 	pos_type;
-  typedef filebuf::off_type 	off_type;
-
-  bool 				test = true;
-  streamsize 			strmsz_1, strmsz_2;
-  streamoff  			strmof_1, strmof_2;
-
-  int_type c1;
-  int_type c2;
-  int_type c3;
-
-  pos_type pt_1(off_type(-1));
-  pos_type pt_2(off_type(0));
-  off_type off_1 = 0;
-  off_type off_2 = 0;
+  typedef streambuf::pos_type pos_type;
+  typedef streambuf::off_type off_type;
+  pos_type bad = pos_type(off_type(-1));
+  pos_type p = 0;
 
   // seekoff
-  // pubseekoff(off_type off, ios_base::seekdir way, ios_base::openmode which)
-  // alters the stream position to off
+  p = in.pubseekoff(0, ios_base::beg, ios_base::in);
+  if (pass)
+    VERIFY( p != bad );
+
+  p = in.pubseekoff(0, ios_base::beg, ios_base::out); 
+  if (pass)
+    VERIFY( p != bad );
 
-  // in | out
-  {
-    constraint_filebuf fb_03;
-    fb_03.open(name_01, ios_base::out | ios_base::in);
-    VERIFY( !fb_03.write_position() );
-    VERIFY( !fb_03.read_position() );
-    // 27filebuf-3.txt = bd23456789:;<=>?...
-    //beg
-    strmsz_1 = fb_03.in_avail(); 
-    pt_1 = fb_03.pubseekoff(2, ios_base::beg);
-    strmsz_2 = fb_03.in_avail(); 
-    off_1 = pt_1;
-    VERIFY( off_1 > 0 );
-    c1 = fb_03.snextc(); //current in pointer +1
-    VERIFY( c1 == '9' );
-    fb_03.pubseekoff(3, ios_base::beg);
-    c2 = fb_03.sputc('\n');  //current in pointer +1
-    fb_03.pubseekoff(4, ios_base::beg);
-    c3 = fb_03.sgetc();
-    VERIFY( c2 != c3 ); 
-    VERIFY( c3 == '9' );
-    fb_03.pubsync(); 
-    c1 = fb_03.sgetc();
-    VERIFY( c1 == c3 );
-    //cur
-    // 27filebuf-3.txt = bd2\n456789:;<=>?...
-    pt_2 = fb_03.pubseekoff(2, ios_base::cur);
-    off_2 = pt_2;
-    VERIFY( (off_2 == (off_1 + 2 + 1 + 1)) );
-    c1 = fb_03.snextc(); //current in pointer +1
-    VERIFY( c1 == '1' );
-    fb_03.pubseekoff(0, ios_base::cur);
-    c2 = fb_03.sputc('x');  //test current out pointer
-    c3 = fb_03.sputc('\n');
-    fb_03.pubseekoff(0, ios_base::cur);
-    c1 = fb_03.sgetc();
-    fb_03.pubsync(); 
-    c3 = fb_03.sgetc();
-    VERIFY( c1 == c3 );
-    //end
-    // 27filebuf-3.txt = "bd2\n456x\n9" 
-    pt_2 = fb_03.pubseekoff(0, ios_base::end);
-    off_1 = pt_2;
-    VERIFY( off_1 > off_2 ); //weak, but don't know exactly where it ends
-    c3 = fb_03.sputc('\n');
-    strmsz_1 = fb_03.sputn("because because because. . .", 28);  
-    VERIFY( strmsz_1 == 28 );
-    fb_03.pubseekoff(-1, ios_base::end);
-    fb_03.sgetc();
-    c1 = fb_03.sungetc();
-    // Defect?  retval of sungetc is not necessarily the character ungotten.
-    // So re-get it.
-    c1 = fb_03.sgetc();
-    fb_03.pubsync(); 
-    c3 = fb_03.sgetc();
-    VERIFY( c1 == c3 );
-    VERIFY( !fb_03.write_position() );
-    VERIFY( fb_03.read_position() );
-  }
+  p = in.pubseekoff(0, ios_base::beg); 
+  if (pass)
+    VERIFY( p != bad );
 }
 
-main() 
+const char name_01[] = "filebuf_virtuals-1.tst"; // file with data in it
+const char name_03[] = "filebuf_members-1.tst"; // empty file
+
+int main() 
 {
-  test05();
+  using namespace std;
+
+  filebuf in1;
+  in1.open(name_01, ios_base::in | ios_base::out);
+  filebuf in2;
+  filebuf in3;
+  in3.open(name_03, ios_base::in | ios_base::out);
+  test02(in1, true);
+  test02(in2, false);
+  test02(in3, true);
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-out.cc
new file mode 100644
index 00000000000..8749ff0bea4
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-out.cc
@@ -0,0 +1,64 @@
+// 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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.
+
+// This library 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 library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 27.7.1.3 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+void test02(std::filebuf& in, bool pass)
+{
+  bool test = true;
+  using namespace std;
+  typedef streambuf::pos_type pos_type;
+  typedef streambuf::off_type off_type;
+  pos_type bad = pos_type(off_type(-1));
+  pos_type p = 0;
+
+  // seekoff
+  p = in.pubseekoff(0, ios_base::beg, ios_base::in);
+  VERIFY( p == bad );
+
+  p = in.pubseekoff(0, ios_base::beg, ios_base::out); 
+  if (pass)
+    VERIFY( p != bad );
+
+  p = in.pubseekoff(0, ios_base::beg); 
+  if (pass)
+    VERIFY( p != bad );
+}
+
+const char name_01[] = "filebuf_virtuals-1.tst"; // file with data in it
+const char name_03[] = "filebuf_members-1.tst"; // empty file
+
+int main() 
+{
+  using namespace std;
+
+  filebuf out1;
+  out1.open(name_01, ios_base::out);
+  filebuf out2;
+  filebuf out3;
+  out3.open(name_03, ios_base::out);
+  test02(out1, true);
+  test02(out2, false);
+  test02(out3, true);
+  return 0;
+}