re PR libstdc++/10063 (stdio_filebuf broken)

2003-12-10  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/10063
	* config/io/basic_file_stdio.cc (__basic_file::sys_open): Sync.
	* testsuite/ext/stdio_filebuf/char/10063-1.cc: New.
	* testsuite/ext/stdio_filebuf/char/10063-2.cc: New.

From-SVN: r74505

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a328388d731d943a059ba849645cf5eb3a500af6..39dfb089a7dc1f500f3ca843fa73480c458d8805 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-10  Benjamin Kosnik  <bkoz@redhat.com>
+
+       PR libstdc++/10063
+       * config/io/basic_file_stdio.cc (__basic_file::sys_open): Sync.
+       * testsuite/ext/stdio_filebuf/char/10063-1.cc: New.
+       * testsuite/ext/stdio_filebuf/char/10063-2.cc: New.
+       
 2003-12-10  Paolo Carlini  <pcarlini@suse.de>
 
        * include/bits/locale_facets.tcc (num_put::do_put(void*)):

diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc
index e03e869d89049cdda935c83f56e560a4e1c98661..7d014e448b4a03ca1fda33f82e1af9ec33ea12b4 100644 (file)
--- a/libstdc++-v3/config/io/basic_file_stdio.cc
+++ b/libstdc++-v3/config/io/basic_file_stdio.cc
@@ -134,6 +134,7 @@ namespace std
       {
        _M_cfile = __file;
        _M_cfile_created = false;
+       this->sync();
        __ret = this;
       }
     return __ret;
@@ -201,7 +202,7 @@ namespace std
        if (_M_cfile_created)
          fclose(_M_cfile);
        else
-         fflush(_M_cfile);
+         this->sync();
        _M_cfile = 0;
        __ret = this;
       }

diff --git a/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-1.cc b/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-1.cc
new file mode 100644 (file)
index 0000000..3a60293
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-1.cc
@@ -0,0 +1,54 @@
+// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation
+//
+// 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.
+
+#include <cstdio>
+#include <fstream>
+#include <ext/stdio_filebuf.h>
+#include <testsuite_hooks.h>
+
+void test1()
+{
+  using namespace std;
+  bool test __attribute__((unused)) = true;
+
+  FILE* file = fopen("tmp_10063-1", "w");
+  putc('0', file);
+  putc('1', file);
+  {
+    __gnu_cxx::stdio_filebuf<char> sbuf(file, ios_base::out);
+    sbuf.sputc('2');
+    sbuf.sputc('3');
+  }
+  putc('4', file);     
+  fclose(file);
+
+  filebuf fbuf;
+  fbuf.open("tmp_10063-1", ios_base::in);      
+  char buf[10];
+  streamsize n = fbuf.sgetn(buf, sizeof(buf));         
+  fbuf.close();
+
+  VERIFY(n == 5);
+  VERIFY(!memcmp(buf, "01234", 5)); 
+}
+
+int main()
+{
+  test1();
+  return 0;
+}

diff --git a/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-2.cc b/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-2.cc
new file mode 100644 (file)
index 0000000..9786d70
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-2.cc
@@ -0,0 +1,57 @@
+// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation
+//
+// 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.
+
+#include <cstdio>
+#include <fstream>
+#include <ext/stdio_filebuf.h>
+#include <testsuite_hooks.h>
+
+void test2()
+{
+  using namespace std;
+  bool test __attribute__((unused)) = true;
+
+  filebuf fbuf;
+  fbuf.open("tmp_10063-2", ios_base::out | ios_base::trunc);
+  fbuf.sputn("01234", 5);
+  fbuf.close();
+
+  FILE* file = fopen("tmp_10063-2", "r");
+  int c = getc(file);
+  VERIFY(c == '0');
+  c = getc(file);
+  VERIFY(c == '1');
+  {
+    __gnu_cxx::stdio_filebuf<char> sbuf(file, ios_base::in);
+    c = sbuf.sbumpc();
+    VERIFY(c == '2');
+    c = sbuf.sbumpc();
+    VERIFY(c == '3');
+    c = sbuf.sbumpc();
+    VERIFY(c == '4');
+    c = sbuf.sgetc();
+    VERIFY(c == EOF);
+  }
+  fclose(file);
+}
+
+int main()
+{
+  test2();
+  return 0;
+}