Runtime.java (exec): Convert prog name and arguments to string array.
* java/lang/Runtime.java (exec): Convert prog name and arguments to string array. * java/lang/natPosixProcess.cc (startProcess): Fix typo in environment array conversion. Preserve current environment if envp not passed. Preserve PATH unless explicitly specified. * java/io/DataInputStream.java (readLine): Fix case where '\r' is followed by EOF. Set a flag when a line is terminated by '\r' and ignore following '\n' if set. From-SVN: r27458
This commit is contained in:
parent
8d30c4ee01
commit
1e45a14105
4 changed files with 87 additions and 33 deletions
|
@ -13,6 +13,7 @@ package java.lang;
|
|||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
/**
|
||||
* @author Tom Tromey <tromey@cygnus.com>
|
||||
|
@ -30,15 +31,15 @@ public class Runtime
|
|||
{
|
||||
public Process exec (String prog) throws IOException
|
||||
{
|
||||
String[] a = new String[1];
|
||||
a[0] = prog;
|
||||
return exec (a, null);
|
||||
return exec (prog, null);
|
||||
}
|
||||
|
||||
public Process exec (String prog, String[] envp) throws IOException
|
||||
{
|
||||
String[] a = new String[1];
|
||||
a[0] = prog;
|
||||
StringTokenizer st = new StringTokenizer(prog);
|
||||
String[] a = new String[st.countTokens ()];
|
||||
for (int i = 0; i < a.length; i++)
|
||||
a[i] = st.nextToken ();
|
||||
return exec (a, envp);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue