git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Win32Process.java (ConcreteProcess): Surround a command line element with quotes if it contains an embedded space or tab. 

2003-07-26  Ranjit Mathew  <rmathew@hotmail.com>

	* java/lang/Win32Process.java (ConcreteProcess): Surround
	a command line element with quotes if it contains an
	embedded space or tab.
	* java/lang/natWin32Process.cc (startProcess): Do not
	surround command line elements with quotes here.

From-SVN: r69844
This commit is contained in:
Ranjit Mathew 2003-07-27 04:13:03 +00:00 committed by Tom Tromey
parent 6eb085352b
commit cc33095ccf
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,5 +1,11 @@
2003-07-26 Ranjit Mathew <rmathew@hotmail.com> 2003-07-26 Ranjit Mathew <rmathew@hotmail.com>
* java/lang/Win32Process.java (ConcreteProcess): Surround
a command line element with quotes if it contains an
embedded space or tab.
* java/lang/natWin32Process.cc (startProcess): Do not
surround command line elements with quotes here.
* configure.host: Use -fcheck-references and * configure.host: Use -fcheck-references and
-fuse-divide-subroutine for MinGW until we fix -fuse-divide-subroutine for MinGW until we fix
win32_exception_handler( ) in win32.cc w.r.t. Win32 win32_exception_handler( ) in win32.cc w.r.t. Win32

8
libjava/java/lang/Win32Process.java
View File

@ -67,6 +67,14 @@ final class ConcreteProcess extends Process
File dir) File dir)
throws IOException throws IOException
{ {
for (int i = 0; i < progarray.length; i++)
{
String s = progarray[i];
if ( (s.indexOf (' ') >= 0) || (s.indexOf ('\t') >= 0))
progarray[i] = "\"" + s + "\"";
}
startProcess (progarray, envp, dir); startProcess (progarray, envp, dir);
} }

4
libjava/java/lang/natWin32Process.cc
View File

@ -136,7 +136,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
int cmdLineLen = 0; int cmdLineLen = 0;
for (int i = 0; i < progarray->length; ++i) for (int i = 0; i < progarray->length; ++i)
cmdLineLen += (_Jv_GetStringUTFLength (elts[i]) + 3); cmdLineLen += (_Jv_GetStringUTFLength (elts[i]) + 1);
char *cmdLine = (char *) _Jv_Malloc (cmdLineLen + 1); char *cmdLine = (char *) _Jv_Malloc (cmdLineLen + 1);
char *cmdLineCurPos = cmdLine; char *cmdLineCurPos = cmdLine;
@ -145,11 +145,9 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
{ {
if (i > 0) if (i > 0)
*cmdLineCurPos++ = ' '; *cmdLineCurPos++ = ' ';
*cmdLineCurPos++ = '\"';
jsize s = _Jv_GetStringUTFLength (elts[i]); jsize s = _Jv_GetStringUTFLength (elts[i]);
_Jv_GetStringUTFRegion (elts[i], 0, s, cmdLineCurPos); _Jv_GetStringUTFRegion (elts[i], 0, s, cmdLineCurPos);
cmdLineCurPos += s; cmdLineCurPos += s;
*cmdLineCurPos++ = '\"';
} }
*cmdLineCurPos = '\0'; *cmdLineCurPos = '\0';