re PR libstdc++/59427 (Opening with ios::in | ios::app does not allow appending)

2013-12-09  Paolo Carlini  <paolo.carlini@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.

From-SVN: r205837

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a9943ddb8a3ffa46ed56ac7d80776e5e4fb57ffe..a9f6075897b0cf378c6e1e9611f5e0ae7199664d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-09  Paolo Carlini  <paolo.carlini@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.
+
 2013-12-09  Renlin Li <Renlin.Li@arm.com>
 
        * testsuite/20_util/hash/chi2_quality.cc: Change -DSAMPLES=30000.

diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index 483a5761191123d5d7b500908871cf3df2016916..04debe547199f84a66492fe2b67cb2170af2270b 100644 (file)
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -423,7 +423,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       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 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       // 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)
        {

diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream
index 701247a9cc3a1a93bd5a1c22ac8b3fdd34135927..ce27eb61a080e5721a53557d815356069250d86e 100644 (file)
--- a/libstdc++-v3/include/std/fstream
+++ b/libstdc++-v3/include/std/fstream
@@ -397,8 +397,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       _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

diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/59427.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/59427.cc
new file mode 100644 (file)
index 0000000..9638c6c
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/59427.cc
@@ -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;
+}

diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/59427.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/59427.cc
new file mode 100644 (file)
index 0000000..ed1ef42
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/59427.cc
@@ -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;
+}