istream.tcc (istream::read): Fix.

2002-04-22  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/istream.tcc (istream::read): Fix.
	* testsuite/27_io/istream_unformatted.cc (main): Add.

From-SVN: r52628

libstdc++-v3/ChangeLog

+2002-04-22  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/bits/istream.tcc (istream::read): Fix.
+	* testsuite/27_io/istream_unformatted.cc (main): Add.
+
 2002-04-20  Benjamin Kosnik  <bkoz@redhat.com>
 
 	PR libstdc++/6360

libstdc++-v3/include/bits/istream.tcc

@@ -777,17 +777,8 @@ namespace std
 	{
 	  try 
 	    {
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-	      int_type __c = __sb->sgetc();	
-	      
-	      while (_M_gcount < __n && __c != __eof)
-		{
-		  *__s++ = traits_type::to_char_type(__c);
-		  ++_M_gcount;
-		  __c = __sb->snextc();
-		}
-	      if (__c == __eof)
+	      _M_gcount = this->rdbuf()->sgetn(__s, __n);
+	      if (_M_gcount != __n)
 		this->setstate(ios_base::eofbit | ios_base::failbit);
 	    }	    
 	  catch(exception& __fail)

libstdc++-v3/testsuite/27_io/istream_unformatted.cc

@@ -499,6 +499,20 @@ test08()
   VERIFY( c == 'i' );
 }
     
+// Theodore Papadopoulo 
+void 
+test09()
+{
+  using namespace std;
+  bool test = true;
+
+  istringstream iss("Juana Briones");
+  char tab[13];
+  iss.read(tab, 13);
+  if (!iss)
+    test = false;
+  VERIFY( test );
+}
 
 int 
 main()
@@ -511,6 +525,7 @@ main()
   test06();
   test07();
   test08();
+  test09();
 
   return 0;
 }