KJ16609/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2026-02-22 12:00:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

re PR libgcj/29151 ([win32] Runtime.exec(String[] cmdarray, String[] envp) -> envp doesn't work)

Browse Source 
PR libgcj/29151:
* java/lang/natWin32Process.cc (startProcess): Unconditionally
create a UNICODE environment for CreateProcess call.

From-SVN: r119230
This commit is contained in:
Mohan Embar
2006-11-26 19:53:11 +00:00
committed by Mohan Embar
parent 03e9913945
commit be5f186090
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@@ -1,3 +1,9 @@
2006-11-26 Mohan Embar <gnustuff@thisiscool.com>
PR libgcj/29151:
* java/lang/natWin32Process.cc (startProcess): Unconditionally
create a UNICODE environment for CreateProcess call.
2006-10-20 Tom Tromey <tromey@redhat.com>
* testsuite/libjava.jvmti/natevents.cc (do_callback_arg_tests):

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

@@ -240,8 +240,10 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
}
*cmdLineCurPos = _T('\0');
// Get the environment, if any.
LPTSTR env = NULL;
// Get the environment, if any. Unconditionally
// create a UNICODE environment, even on ANSI
// builds.
LPWSTR env = NULL;
if (envp)
{
elts = elements (envp);
@@ -250,22 +252,22 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
for (int i = 0; i < envp->length; ++i)
envLen += (elts[i]->length() + 1);
env = (LPTSTR) _Jv_Malloc ((envLen + 1) * sizeof(TCHAR));
env = (LPWSTR) _Jv_Malloc ((envLen + 1) * sizeof(WCHAR));
int j = 0;
for (int i = 0; i < envp->length; ++i)
{
jint len = elts[i]->length();
jstring elt = elts[i];
jint len = elt->length();
JV_TEMP_STRING_WIN32(thiselt, elts[i]);
_tcscpy(env + j, thiselt);
wcsncpy(env + j, (LPCWSTR) JvGetStringChars(elt), len);
j += len;
// Skip past the null terminator that _tcscpy just inserted.
j++;
// Insert the null terminator and skip past it.
env[j++] = 0;
}
*(env + j) = _T('\0');
*(env + j) = 0;
}
// Get the working directory path, if specified.