From 4f7279ab3ef8e5ac64f2c8d45889196cf29d0d2a Mon Sep 17 00:00:00 2001
From: Bryce McKinlay <bryce@waitaki.otago.ac.nz>
Date: Mon, 24 Sep 2001 04:51:50 +0000
Subject: [PATCH] PosixProcess.java (exitValue): Implement here.

	* java/lang/PosixProcess.java (exitValue): Implement here. Throw
	IllegalThreadStateException if process hasn't exited yet.
	* java/lang/natPosixProcess.cc (exitValue): Removed.
	(waitFor): Only check thread interrupted status if waitpid()
	returned an error. Use WIFEXITED and WEXITSTATUS to process process's
	exit value.

From-SVN: r45766
---
 libjava/ChangeLog                    |  9 +++++++
 libjava/java/lang/PosixProcess.java  |  8 +++++-
 libjava/java/lang/natPosixProcess.cc | 39 +++++++++-------------------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ff37f04f269..4cb62a87b67 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2001-09-24  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+	* java/lang/PosixProcess.java (exitValue): Implement here. Throw 
+	IllegalThreadStateException if process hasn't exited yet.
+	* java/lang/natPosixProcess.cc (exitValue): Removed.
+	(waitFor): Only check thread interrupted status if waitpid() returned
+	an error. Use WIFEXITED and WEXITSTATUS to process process's exit
+	value.
+
 2001-09-22  Anthony Green  <green@redhat.com>
 
  	* java/security/DummyKeyPairGenerator.java (initialize): New
diff --git a/libjava/java/lang/PosixProcess.java b/libjava/java/lang/PosixProcess.java
index 36182598b3b..459f76c3da7 100644
--- a/libjava/java/lang/PosixProcess.java
+++ b/libjava/java/lang/PosixProcess.java
@@ -26,7 +26,13 @@ import java.io.IOException;
 final class ConcreteProcess extends Process
 {
   public native void destroy ();
-  public native int exitValue ();
+
+  public int exitValue ()
+  {
+    if (! hasExited)
+      throw new IllegalThreadStateException("Process has not exited");
+    return status;
+  }
 
   public InputStream getErrorStream ()
   {
diff --git a/libjava/java/lang/natPosixProcess.cc b/libjava/java/lang/natPosixProcess.cc
index 5cce9674c9a..516fb045fd7 100644
--- a/libjava/java/lang/natPosixProcess.cc
+++ b/libjava/java/lang/natPosixProcess.cc
@@ -48,27 +48,6 @@ java::lang::ConcreteProcess::destroy (void)
     }
 }
 
-jint
-java::lang::ConcreteProcess::exitValue (void)
-{
-  if (! hasExited)
-    {
-      int wstat;
-      pid_t r = waitpid ((pid_t) pid, &wstat, WNOHANG);
-      if (r == -1)
-	{
-	  jstring x = JvNewStringLatin1 (strerror (errno));
-	  throw new IllegalThreadStateException (x);
-	}
-
-      hasExited = true;
-      // Just use the raw status.  FIXME: what is right?
-      status = wstat;
-    }
-
-  return status;
-}
-
 jint
 java::lang::ConcreteProcess::waitFor (void)
 {
@@ -77,15 +56,21 @@ java::lang::ConcreteProcess::waitFor (void)
       int wstat;
       int r = waitpid ((pid_t) pid, &wstat, 0);
 
-      if (r != -1)
+      if (r == -1)
+        {
+	  if (java::lang::Thread::interrupted())
+	    throw new InterruptedException (JvNewStringLatin1 (strerror
+	      (errno)));
+	}
+      else
 	{
 	  hasExited = true;
-	  // Just use the raw status.  FIXME: what is right?
-	  status = wstat;
-	}
 
-      if (java::lang::Thread::interrupted())
-	throw new InterruptedException (JvNewStringLatin1 ("wait interrupted"));
+	  if (WIFEXITED (wstat))
+	    status = WEXITSTATUS (wstat);
+	  else
+	    status = -1;
+	}
     }
 
   return status;