natFileDescriptorPosix.cc (write): Try again on EINTR.

	* java/io/natFileDescriptorPosix.cc (write): Try again on EINTR.
	(write): Likewise.
	(read): Likewise.
	(read): Likewise.

From-SVN: r69807

libjava/ChangeLog

+2003-07-25  Tom Tromey  <tromey@redhat.com>
+
+	* java/io/natFileDescriptorPosix.cc (write): Try again on EINTR.
+	(write): Likewise.
+	(read): Likewise.
+	(read): Likewise.
+
 2003-07-25  Mark Wielaard  <mark@klomp.org>
 
 	* java/lang/natRuntime.cc (_load): Add library name to

libjava/java/io/natFileDescriptorPosix.cc

@@ -150,6 +150,7 @@ java::io::FileDescriptor::write (jint b)
 	      iioe->bytesTransferred = r == -1 ? 0 : r;
 	      throw iioe;
 	    }	    
+	  if (errno != EINTR)
 	    throw new IOException (JvNewStringLatin1 (strerror (errno)));
 	}
     }
@@ -178,6 +179,7 @@ java::io::FileDescriptor::write (jbyteArray b, jint offset, jint len)
 	      iioe->bytesTransferred = written;
 	      throw iioe;
 	    }
+	  if (errno != EINTR)
 	    throw new IOException (JvNewStringLatin1 (strerror (errno)));
 	}
 
@@ -282,7 +284,10 @@ jint
 java::io::FileDescriptor::read (void)
 {
   jbyte b;
-  int r = ::read (fd, &b, 1);
+  int r;
+  do
+    {
+      r = ::read (fd, &b, 1);
       if (r == 0)
 	return -1;
       if (r == -1)
@@ -294,8 +299,11 @@ java::io::FileDescriptor::read (void)
 	      iioe->bytesTransferred = r == -1 ? 0 : r;
 	      throw iioe;
 	    }
+	  if (errno != EINTR)
 	    throw new IOException (JvNewStringLatin1 (strerror (errno)));
 	}
+    }
+  while (r != 1);
   position++;
   return b & 0xFF;
 }
@@ -314,7 +322,10 @@ java::io::FileDescriptor::read (jbyteArray buffer, jint offset, jint count)
     return 0;
 
   jbyte *bytes = elements (buffer) + offset;
-  int r = ::read (fd, bytes, count);
+  int r;
+  do
+    {
+      r = ::read (fd, bytes, count);
       if (r == 0)
 	return -1;
       if (r == -1)
@@ -326,8 +337,11 @@ java::io::FileDescriptor::read (jbyteArray buffer, jint offset, jint count)
 	      iioe->bytesTransferred = r == -1 ? 0 : r;
 	      throw iioe;
 	    }
+	  if (errno != EINTR)
 	    throw new IOException (JvNewStringLatin1 (strerror (errno)));
 	}
+    }
+  while (r <= 0);
   position += r;
   return r;
 }