2005-01-11 Paolo Carlini <pcarlini@suse.de>
+ Benjamin Kosnik <bkoz@redhat.com>
+
+ * src/istream.cc (basic_istream<char>::ignore(streamsize),
+ basic_istream<char>::ignore(streamsize, int_type),
+ basic_istream<wchar_t>::ignore(streamsize),
+ basic_istream<wchar_t>::ignore(streamsize, int_type)): In case
+ more than numeric_limits<streamsize>::max() chars are skipped,
+ set _M_gcount = max().
+ * include/bits/istream.tcc (ignore(streamsize), ignore(streamsize,
+ int_type)): Likewise; keep simple, don't forward.
+
+2005-01-11 Paolo Carlini <pcarlini@suse.de>
* src/istream.cc (basic_istream<char>::ignore(streamsize),
basic_istream<char>::ignore(streamsize, int_type),
basic_istream<_CharT, _Traits>::
ignore(streamsize __n)
{
- if (__n == 1)
- return ignore();
-
_M_gcount = 0;
sentry __cerb(*this, true);
if (__cerb && __n > 0)
// by definition, when more than 2G chars are actually ignored,
// _M_gcount (the return value of gcount, that is) cannot be
// really correct, being unavoidably too small.
+ bool __large_ignore = false;
while (true)
{
while (_M_gcount < __n
}
if (__n == numeric_limits<streamsize>::max()
&& !traits_type::eq_int_type(__c, __eof))
- _M_gcount = numeric_limits<streamsize>::min();
+ {
+ _M_gcount = numeric_limits<streamsize>::min();
+ __large_ignore = true;
+ }
else
break;
}
+ if (__large_ignore)
+ _M_gcount = numeric_limits<streamsize>::max();
+
if (traits_type::eq_int_type(__c, __eof))
__err |= ios_base::eofbit;
}
basic_istream<_CharT, _Traits>::
ignore(streamsize __n, int_type __delim)
{
- if (traits_type::eq_int_type(__delim, traits_type::eof()))
- return ignore(__n);
-
_M_gcount = 0;
sentry __cerb(*this, true);
if (__cerb && __n > 0)
int_type __c = __sb->sgetc();
// See comment above.
+ bool __large_ignore = false;
while (true)
{
while (_M_gcount < __n
if (__n == numeric_limits<streamsize>::max()
&& !traits_type::eq_int_type(__c, __eof)
&& !traits_type::eq_int_type(__c, __delim))
- _M_gcount = numeric_limits<streamsize>::min();
+ {
+ _M_gcount = numeric_limits<streamsize>::min();
+ __large_ignore = true;
+ }
else
break;
}
+ if (__large_ignore)
+ _M_gcount = numeric_limits<streamsize>::max();
+
if (traits_type::eq_int_type(__c, __eof))
__err |= ios_base::eofbit;
else if (traits_type::eq_int_type(__c, __delim))
{
- ++_M_gcount;
+ if (_M_gcount < numeric_limits<streamsize>::max())
+ ++_M_gcount;
__sb->sbumpc();
}
}
int_type __c = __sb->sgetc();
// See comment in istream.tcc.
+ bool __large_ignore = false;
while (true)
{
while (_M_gcount < __n
}
if (__n == numeric_limits<streamsize>::max()
&& !traits_type::eq_int_type(__c, __eof))
- _M_gcount = numeric_limits<streamsize>::min();
+ {
+ _M_gcount = numeric_limits<streamsize>::min();
+ __large_ignore = true;
+ }
else
break;
}
+ if (__large_ignore)
+ _M_gcount = numeric_limits<streamsize>::max();
+
if (traits_type::eq_int_type(__c, __eof))
__err |= ios_base::eofbit;
}
__streambuf_type* __sb = this->rdbuf();
int_type __c = __sb->sgetc();
+ bool __large_ignore = false;
while (true)
{
while (_M_gcount < __n
if (__n == numeric_limits<streamsize>::max()
&& !traits_type::eq_int_type(__c, __eof)
&& !traits_type::eq_int_type(__c, __delim))
- _M_gcount = numeric_limits<streamsize>::min();
+ {
+ _M_gcount = numeric_limits<streamsize>::min();
+ __large_ignore = true;
+ }
else
break;
}
+ if (__large_ignore)
+ _M_gcount = numeric_limits<streamsize>::max();
+
if (traits_type::eq_int_type(__c, __eof))
__err |= ios_base::eofbit;
else if (traits_type::eq_int_type(__c, __delim))
{
- ++_M_gcount;
+ if (_M_gcount < numeric_limits<streamsize>::max())
+ ++_M_gcount;
__sb->sbumpc();
}
}
__streambuf_type* __sb = this->rdbuf();
int_type __c = __sb->sgetc();
+ bool __large_ignore = false;
while (true)
{
while (_M_gcount < __n
}
if (__n == numeric_limits<streamsize>::max()
&& !traits_type::eq_int_type(__c, __eof))
- _M_gcount = numeric_limits<streamsize>::min();
+ {
+ _M_gcount = numeric_limits<streamsize>::min();
+ __large_ignore = true;
+ }
else
break;
}
+ if (__large_ignore)
+ _M_gcount = numeric_limits<streamsize>::max();
+
if (traits_type::eq_int_type(__c, __eof))
__err |= ios_base::eofbit;
}
__streambuf_type* __sb = this->rdbuf();
int_type __c = __sb->sgetc();
+ bool __large_ignore = false;
while (true)
{
while (_M_gcount < __n
if (__n == numeric_limits<streamsize>::max()
&& !traits_type::eq_int_type(__c, __eof)
&& !traits_type::eq_int_type(__c, __delim))
- _M_gcount = numeric_limits<streamsize>::min();
+ {
+ _M_gcount = numeric_limits<streamsize>::min();
+ __large_ignore = true;
+ }
else
break;
}
+ if (__large_ignore)
+ _M_gcount = numeric_limits<streamsize>::max();
+
if (traits_type::eq_int_type(__c, __eof))
__err |= ios_base::eofbit;
else if (traits_type::eq_int_type(__c, __delim))
{
- ++_M_gcount;
+ if (_M_gcount < numeric_limits<streamsize>::max())
+ ++_M_gcount;
__sb->sbumpc();
}
}