Hi,
as described in the trail, my implementation of lwg/596 isn't complete
and finally somebody noticed ;) But isn't much work. Richard, if you
distilled the testcase from a larger piece of code, you may want to
double check it on that too (in case of remaining issues, please let me
know asap)
Tested x86_64-linux.
Thanks,
Paolo.
//////////////////////////////
2013-12-09 Paolo Carlini <paolo.carl...@oracle.com>
PR libstdc++/59427
* include/bits/fstream.tcc (basic_filebuf<>::overflow,
basic_filebuf<>::xsputn): Per lwg/596, ios_base::app implies
ios_base:out.
* include/std/fstream (basic_filebuf<>::_M_set_buffer): Likewise.
* testsuite/27_io/basic_filebuf/sputc/char/59427.cc: New.
* testsuite/27_io/basic_filebuf/sputn/char/59427.cc: Likewise.
Index: include/bits/fstream.tcc
===================================================================
--- include/bits/fstream.tcc (revision 205803)
+++ include/bits/fstream.tcc (working copy)
@@ -423,7 +423,8 @@
{
int_type __ret = traits_type::eof();
const bool __testeof = traits_type::eq_int_type(__c, __ret);
- const bool __testout = _M_mode & ios_base::out;
+ const bool __testout = (_M_mode & ios_base::out
+ || _M_mode & ios_base::app);
if (__testout)
{
if (_M_reading)
@@ -640,7 +641,8 @@
// Optimization in the always_noconv() case, to be generalized in the
// future: when __n is sufficiently large we write directly instead of
// using the buffer.
- const bool __testout = _M_mode & ios_base::out;
+ const bool __testout = (_M_mode & ios_base::out
+ || _M_mode & ios_base::app);
if (__check_facet(_M_codecvt).always_noconv()
&& __testout && !_M_reading)
{
Index: include/std/fstream
===================================================================
--- include/std/fstream (revision 205803)
+++ include/std/fstream (working copy)
@@ -397,8 +397,9 @@
_M_set_buffer(streamsize __off)
{
const bool __testin = _M_mode & ios_base::in;
- const bool __testout = _M_mode & ios_base::out;
-
+ const bool __testout = (_M_mode & ios_base::out
+ || _M_mode & ios_base::app);
+
if (__testin && __off > 0)
this->setg(_M_buf, _M_buf, _M_buf + __off);
else
Index: testsuite/27_io/basic_filebuf/sputc/char/59427.cc
===================================================================
--- testsuite/27_io/basic_filebuf/sputc/char/59427.cc (revision 0)
+++ testsuite/27_io/basic_filebuf/sputc/char/59427.cc (working copy)
@@ -0,0 +1,39 @@
+// Copyright (C) 2013 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 3, 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 COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-require-fileio "" }
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+// libstdc++/59427
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+ using namespace std;
+
+ filebuf a_f;
+ VERIFY( a_f.open("tmp_59427_sputc", ios_base::in | ios_base::app) );
+ VERIFY( 'a' == a_f.sputc('a') );
+ VERIFY( a_f.close() );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
Index: testsuite/27_io/basic_filebuf/sputn/char/59427.cc
===================================================================
--- testsuite/27_io/basic_filebuf/sputn/char/59427.cc (revision 0)
+++ testsuite/27_io/basic_filebuf/sputn/char/59427.cc (working copy)
@@ -0,0 +1,39 @@
+// Copyright (C) 2013 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 3, 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 COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-require-fileio "" }
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+// libstdc++/59427
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+ using namespace std;
+
+ filebuf a_f;
+ VERIFY( a_f.open("tmp_59427_sputn", ios_base::in | ios_base::app) );
+ VERIFY( 5 == a_f.sputn("abcde", 5) );
+ VERIFY( a_f.close() );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
