OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For PR libgcj/1147:

Browse Source 
* prims.cc (JvConvertArgv): Convert using current locale's
	encoding.

From-SVN: r47862
This commit is contained in:
Tom Tromey 2001-12-11 04:03:57 +00:00 committed by Tom Tromey
parent d12a187337
commit 1ca1c91bd9
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2001-12-10 Tom Tromey <tromey@redhat.com>
For PR libgcj/1147:
* prims.cc (JvConvertArgv): Convert using current locale's
encoding.
2001-12-10 Tom Tromey <tromey@redhat.com>
Fix for PR libgcj/5064.

16
libjava/prims.cc
View File

@ -657,12 +657,20 @@ JvConvertArgv (int argc, const char **argv)
if (argc < 0)
argc = 0;
jobjectArray ar = JvNewObjectArray(argc, &StringClass, NULL);
jobject* ptr = elements(ar);
jobject *ptr = elements(ar);
jbyteArray bytes = NULL;
for (int i = 0; i < argc; i++)
{
const char *arg = argv[i];
// FIXME - should probably use JvNewStringUTF.
*ptr++ = JvNewStringLatin1(arg, strlen(arg));
int len = strlen (arg);
if (bytes == NULL || bytes->length < len)
bytes = JvNewByteArray (len);
jbyte *bytePtr = elements (bytes);
// We assume jbyte == char.
memcpy (bytePtr, arg, len);
// Now convert using the default encoding.
*ptr++ = new java::lang::String (bytes, 0, len);
}
return (JArray<jstring>*) ar;
}
@ -993,7 +1001,7 @@ _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv,
runtime = java::lang::Runtime::getRuntime ();
arg_vec = JvConvertArgv (argc - 1, argv + 1);
if (klass)
main_thread = new gnu::gcj::runtime::FirstThread (klass, arg_vec);
else