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

re PR java/9253 (on win32, java.io.File.listFiles("C:\\") returns pwd instead of the root content of C:) 

2003-01-24  Ranjit Mathew  <rmathew@hotmail.com>

	Fixes PR java/9253:
	* java/io/natFileWin32.cc (performList): Append only "*.*"
	if the canonical file path already has a "\" at the end.

From-SVN: r61736
This commit is contained in:
Ranjit Mathew 2003-01-24 21:57:00 +00:00 committed by Tom Tromey
parent 1f37a5b273
commit 0ced43354f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2003-01-24 Ranjit Mathew <rmathew@hotmail.com>
Fixes PR java/9253:
* java/io/natFileWin32.cc (performList): Append only "*.*"
if the canonical file path already has a "\" at the end.
2003-01-24 Tom Tromey <tromey@redhat.com>
* defineclass.cc (handleMethodsEnd): Precompute code for static

6
libjava/java/io/natFileWin32.cc
View File

@ -146,8 +146,10 @@ java::io::File::performList (java::io::FilenameFilter *filter,
return NULL;
char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (canon) + 5);
jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
// FIXME?
strcpy(&buf[total], "\\*.*");
if (buf[total-1] == '\\')
strcpy (&buf[total], "*.*");
else
strcpy (&buf[total], "\\*.*");
WIN32_FIND_DATA data;
HANDLE handle = FindFirstFile (buf, &data);