PR libstdc++/8071, libstdc++/8127, c++/6745
2002-10-08 Jonathan Lennox <lennox@cs.columbia.edu> PR libstdc++/8071, libstdc++/8127, c++/6745 * streambuf.tcc (__copy_streambufs): Handle cases where __sbin->in_avail() returns 0, or where __sbin doesn't set gptr(). * testsuite/27_io/ostream_inserter_other.cc (test05): Add. From-SVN: r57970
This commit is contained in:
parent
f5264b52cf
commit
3279e88a45
|
@ -1,3 +1,10 @@
|
|||
2002-10-08 Jonathan Lennox <lennox@cs.columbia.edu>
|
||||
|
||||
PR libstdc++/8071, libstdc++/8127, c++/6745
|
||||
* streambuf.tcc (__copy_streambufs): Handle cases where
|
||||
__sbin->in_avail() returns 0, or where __sbin doesn't set gptr().
|
||||
* testsuite/27_io/ostream_inserter_other.cc (test05): Add.
|
||||
|
||||
2002-10-08 Paolo Carlini <pcarlini@unitus.it>
|
||||
Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
|
|
|
@ -208,19 +208,28 @@ namespace std
|
|||
try
|
||||
{
|
||||
while (__testput && __bufsize != -1)
|
||||
{
|
||||
__xtrct = __sbout->sputn(__sbin->gptr(), __bufsize);
|
||||
__ret += __xtrct;
|
||||
__sbin->_M_in_cur_move(__xtrct);
|
||||
if (__xtrct == __bufsize)
|
||||
{
|
||||
if (__bufsize != 0 && __sbin->gptr() != NULL)
|
||||
{
|
||||
if (_Traits::eq_int_type(__sbin->sgetc(), _Traits::eof()))
|
||||
__xtrct = __sbout->sputn(__sbin->gptr(), __bufsize);
|
||||
__ret += __xtrct;
|
||||
__sbin->_M_in_cur_move(__xtrct);
|
||||
if (__xtrct != __bufsize)
|
||||
break;
|
||||
__bufsize = __sbin->in_avail();
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
_CharT __buf[256];
|
||||
streamsize __charsread = __sbin->sgetn(__buf, sizeof(__buf));
|
||||
__xtrct = __sbout->sputn(__buf, __charsread);
|
||||
__ret += __xtrct;
|
||||
if (__xtrct != __charsread)
|
||||
break;
|
||||
}
|
||||
if (_Traits::eq_int_type(__sbin->sgetc(), _Traits::eof()))
|
||||
break;
|
||||
__bufsize = __sbin->in_avail();
|
||||
}
|
||||
}
|
||||
catch(exception& __fail)
|
||||
{
|
||||
|
|
|
@ -149,6 +149,99 @@ void test04()
|
|||
VERIFY( test );
|
||||
}
|
||||
|
||||
|
||||
class test_buffer_1 : public std::streambuf
|
||||
{
|
||||
public:
|
||||
test_buffer_1(const std::string& s) : str(s), it(str.begin()) { }
|
||||
|
||||
protected:
|
||||
virtual int underflow() { return (it != str.end() ? *it : EOF); }
|
||||
virtual int uflow() { return (it != str.end() ? *it++ : EOF); }
|
||||
|
||||
private:
|
||||
const std::string str;
|
||||
std::string::const_iterator it;
|
||||
};
|
||||
|
||||
|
||||
class test_buffer_2 : public std::streambuf
|
||||
{
|
||||
public:
|
||||
test_buffer_2(const std::string& s) : str(s), it(str.begin()) { }
|
||||
|
||||
protected:
|
||||
virtual int underflow() { return (it != str.end() ? *it : EOF); }
|
||||
virtual int uflow() { return (it != str.end() ? *it++ : EOF); }
|
||||
virtual std::streamsize showmanyc() { return std::distance(it, str.end()); }
|
||||
private:
|
||||
const std::string str;
|
||||
std::string::const_iterator it;
|
||||
};
|
||||
|
||||
|
||||
class test_buffer_3 : public std::streambuf
|
||||
{
|
||||
public:
|
||||
test_buffer_3(const std::string& s) : str(s), it(str.begin()) { }
|
||||
|
||||
protected:
|
||||
virtual int underflow() { return (it != str.end() ? *it : EOF); }
|
||||
virtual int uflow() { return (it != str.end() ? *it++ : EOF); }
|
||||
virtual std::streamsize showmanyc()
|
||||
{
|
||||
std::streamsize ret = std::distance(it, str.end());
|
||||
return ret > 0 ? ret : -1;
|
||||
}
|
||||
private:
|
||||
const std::string str;
|
||||
std::string::const_iterator it;
|
||||
};
|
||||
|
||||
|
||||
void test(const std::string& str, std::streambuf& buf)
|
||||
{
|
||||
bool test = true;
|
||||
|
||||
std::ostringstream out;
|
||||
std::istream in(&buf);
|
||||
|
||||
out << in.rdbuf();
|
||||
|
||||
if (out.str() != str)
|
||||
VERIFY( false );
|
||||
}
|
||||
|
||||
// libstdc++/6745
|
||||
// libstdc++/8071
|
||||
// libstdc++/8127
|
||||
// Jonathan Lennox <lennox@cs.columbia.edu>
|
||||
void test05()
|
||||
{
|
||||
std::ostringstream out_1, out_2, out_3, out_4;
|
||||
|
||||
std::string string_a("Hello, world!");
|
||||
std::string string_b("");
|
||||
|
||||
test_buffer_1 buf1a(string_a);
|
||||
test_buffer_1 buf1b(string_b);
|
||||
|
||||
test_buffer_2 buf2a(string_a);
|
||||
test_buffer_2 buf2b(string_b);
|
||||
|
||||
test_buffer_3 buf3a(string_a);
|
||||
test_buffer_3 buf3b(string_b);
|
||||
|
||||
test(string_a, buf1a);
|
||||
test(string_b, buf1b);
|
||||
|
||||
test(string_a, buf2a);
|
||||
test(string_b, buf2b);
|
||||
|
||||
test(string_a, buf3a);
|
||||
test(string_b, buf3b);
|
||||
}
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
|
@ -157,5 +250,6 @@ main()
|
|||
test03();
|
||||
test04();
|
||||
|
||||
test05();
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue