From 9335d80ab9e0ebdf8a380445a1b28613bbb37e1e Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@unitus.it>
Date: Tue, 10 Jun 2003 21:27:12 +0200
Subject: [PATCH] fstream.tcc (overflow): According to 27.5.2.4.5, overflow()
returns not_eof(eof()).
2003-06-10 Paolo Carlini <pcarlini@unitus.it>
* include/bits/fstream.tcc (overflow): According to
27.5.2.4.5, overflow() returns not_eof(eof()).
* testsuite/27_io/basic_filebuf/overflow/char/2.cc: New.
* testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc: Ditto.
2003-06-10 Paolo Carlini <pcarlini@unitus.it>
* include/bits/fstream.tcc (_M_underflow): Check overflow return
value; tweak slightly.
From-SVN: r67726
---
libstdc++-v3/ChangeLog | 12 +++++
libstdc++-v3/include/bits/fstream.tcc | 14 ++---
.../basic_filebuf/overflow/char/2-unbuf.cc | 54 +++++++++++++++++++
.../27_io/basic_filebuf/overflow/char/2.cc | 53 ++++++++++++++++++
4 files changed, 126 insertions(+), 7 deletions(-)
create mode 100644 libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc
create mode 100644 libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1e370c045682..f0f89ca0848d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-10 Paolo Carlini <pcarlini@unitus.it>
+
+ * include/bits/fstream.tcc (overflow): According to
+ 27.5.2.4.5, overflow() returns not_eof(eof()).
+ * testsuite/27_io/basic_filebuf/overflow/char/2.cc: New.
+ * testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc: Ditto.
+
+2003-06-10 Paolo Carlini <pcarlini@unitus.it>
+
+ * include/bits/fstream.tcc (_M_underflow): Check overflow return
+ value; tweak slightly.
+
2003-06-09 Paolo Carlini <pcarlini@unitus.it>
* include/bits/fstream.tcc (_M_underflow): Do not special
diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index d98830921835..46dbdb2170da 100644
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -193,9 +193,6 @@ namespace std
// fileops happen...
_M_destroy_pback();
- const size_t __buflen = this->_M_buf_size > 1
- ? this->_M_buf_size - 1 : 1;
-
if (this->_M_in_cur < this->_M_in_end)
{
__ret = traits_type::to_int_type(*this->_M_in_cur);
@@ -205,10 +202,13 @@ namespace std
}
// Sync internal and external buffers.
- if (__testout && this->_M_out_beg < this->_M_out_lim)
- this->overflow();
+ if (__testout && this->_M_out_beg < this->_M_out_lim
+ && traits_type::eq_int_type(this->overflow(), __ret))
+ return __ret;
// Get and convert input sequence.
+ const size_t __buflen = this->_M_buf_size > 1
+ ? this->_M_buf_size - 1 : 1;
streamsize __elen = 0;
streamsize __ilen = 0;
if (__check_facet(_M_codecvt).always_noconv())
@@ -348,8 +348,8 @@ namespace std
{
// Unbuffered.
char_type __conv = traits_type::to_char_type(__c);
- if (!__testeof && _M_convert_to_external(&__conv, 1))
- __ret = __c;
+ if (__testeof || _M_convert_to_external(&__conv, 1))
+ __ret = traits_type::not_eof(__c);
}
}
_M_last_overflowed = true;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc
new file mode 100644
index 000000000000..9c5da4485cf6
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc
@@ -0,0 +1,54 @@
+// 2003-06-10 Paolo Carlini <pcarlini@unitus.it>
+
+// Copyright (C) 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>
+
+const char name_08[] = "filebuf_virtuals-8.txt"; // empty file, need to create
+
+class OverBuf : public std::filebuf
+{
+public:
+ int_type pub_overflow(int_type c = traits_type::eof())
+ { return std::filebuf::overflow(c); }
+};
+
+// According to 27.5.2.4.5 filebuf::overflow() returns not_eof(eof()).
+void test01()
+{
+ using namespace std;
+ bool test = true;
+ typedef OverBuf::traits_type traits_type;
+
+ OverBuf fb;
+ fb.pubsetbuf(0, 0);
+ fb.open(name_08, ios_base::out | ios_base::trunc);
+
+ VERIFY( fb.pub_overflow() == traits_type::not_eof(traits_type::eof()) );
+ fb.close();
+}
+
+main()
+{
+ test01();
+ return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc
new file mode 100644
index 000000000000..4984602703aa
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc
@@ -0,0 +1,53 @@
+// 2003-06-10 Paolo Carlini <pcarlini@unitus.it>
+
+// Copyright (C) 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>
+
+const char name_08[] = "filebuf_virtuals-8.txt"; // empty file, need to create
+
+class OverBuf : public std::filebuf
+{
+public:
+ int_type pub_overflow(int_type c = traits_type::eof())
+ { return std::filebuf::overflow(c); }
+};
+
+// According to 27.5.2.4.5 filebuf::overflow() returns not_eof(eof()).
+void test01()
+{
+ using namespace std;
+ bool test = true;
+ typedef OverBuf::traits_type traits_type;
+
+ OverBuf fb;
+ fb.open(name_08, ios_base::out | ios_base::trunc);
+
+ VERIFY( fb.pub_overflow() == traits_type::not_eof(traits_type::eof()) );
+ fb.close();
+}
+
+main()
+{
+ test01();
+ return 0;
+}
--
GitLab