summaryrefslogtreecommitdiff
path: root/vm/reference/java/lang/VMProcess.java
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-08-21 00:57:51 +0000
committerMark Wielaard <mark@klomp.org>2006-08-21 00:57:51 +0000
commitf5d6e044a613d4bc554561a5384288a9f6d17e39 (patch)
tree663a31c6f6866fcc2d8549d34a7172c7f775f653 /vm/reference/java/lang/VMProcess.java
parent310be467f8f83b189b4a40faece32478fad67bc9 (diff)
downloadclasspath-NATIVE-LAYER.tar.gz
* doc/tools.texinfo: Add file from trunk.NATIVE-LAYER
* native/jni/Makefile.am (DIST_SUBDIRS): Add native-lib. * native/jni/java-io/java_io_VMFile.c: Include lstat and readlink headers. * native/jni/java-lang/java_lang_VMProcess.c (Java_java_lang_VMProcess_nativeSpawn): Remove redirect argument. * native/jni/java-net/java_net_VMInetAddress.c (Java_java_net_VMInetAddress_getHostByName): Remove unused variable. * native/jni/native-lib/Makefile.am: Remove empty and nonexisting files. * native/jni/native-lib/cpio.c (cpio_setFileReadonly): Use correct mask. * native/jni/native-lib/cpnet.c (cpnet_connect): Removed unused theaddr. * native/jni/native-lib/cpnet.h (cpnet_freeAddresses): Moved from cpnet.h. * native/jni/native-lib/cpnet.h (cpnet_freeAddresses): Declare, don't implement. * vm/reference/java/lang/VMProcess.java: Removed unused redirect argument. * include/java_lang_VMProcess.h: Regenerated.
Diffstat (limited to 'vm/reference/java/lang/VMProcess.java')
-rw-r--r--vm/reference/java/lang/VMProcess.java17
1 files changed, 6 insertions, 11 deletions
diff --git a/vm/reference/java/lang/VMProcess.java b/vm/reference/java/lang/VMProcess.java
index 076e5999d..86e4a7b9a 100644
--- a/vm/reference/java/lang/VMProcess.java
+++ b/vm/reference/java/lang/VMProcess.java
@@ -95,7 +95,6 @@ final class VMProcess extends Process
InputStream stdout; // process output stream
InputStream stderr; // process error stream
int exitValue; // process exit value
- boolean redirect; // redirect stderr -> stdout
//
// Dedicated thread that does all the fork()'ing and wait()'ing
@@ -200,8 +199,7 @@ final class VMProcess extends Process
{
try
{
- process.nativeSpawn(process.cmd, process.env, process.dir,
- process.redirect);
+ process.nativeSpawn(process.cmd, process.env, process.dir);
process.state = RUNNING;
activeMap.put(new Long(process.pid), process);
}
@@ -220,7 +218,7 @@ final class VMProcess extends Process
}
// Constructor
- private VMProcess(String[] cmd, String[] env, File dir, boolean redirect)
+ private VMProcess(String[] cmd, String[] env, File dir)
throws IOException
{
@@ -229,7 +227,6 @@ final class VMProcess extends Process
this.cmd = cmd;
this.env = env;
this.dir = dir;
- this.redirect = redirect;
// Add process to the new process work list and wakeup processThread
synchronized (workList)
@@ -304,11 +301,10 @@ final class VMProcess extends Process
*/
static Process exec(String[] cmd, String[] env, File dir) throws IOException
{
- return new VMProcess(cmd, env, dir, false);
+ return new VMProcess(cmd, env, dir);
}
- static Process exec(List cmd, Map env,
- File dir, boolean redirect) throws IOException
+ static Process exec(List cmd, Map env, File dir) throws IOException
{
String[] acmd = (String[]) cmd.toArray(new String[cmd.size()]);
String[] aenv = new String[env.size()];
@@ -321,7 +317,7 @@ final class VMProcess extends Process
aenv[i++] = entry.getKey() + "=" + entry.getValue();
}
- return new VMProcess(acmd, aenv, dir, redirect);
+ return new VMProcess(acmd, aenv, dir);
}
public OutputStream getOutputStream()
@@ -380,8 +376,7 @@ final class VMProcess extends Process
*
* @throws IOException if the O/S process could not be created.
*/
- native void nativeSpawn(String[] cmd, String[] env, File dir,
- boolean redirect)
+ native void nativeSpawn(String[] cmd, String[] env, File dir)
throws IOException;
/**