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

re PR libgcj/6652 (new java.io.File("").getCanonicalFile() throws exception) 

* java/io/natFilePosix.cc (getCanonicalPath): Treat "" like ".".
	Fixes PR libgcj/6652.

From-SVN: r54558
This commit is contained in:
Tom Tromey 2002-06-12 17:01:02 +00:00 committed by Tom Tromey
parent d65cb654ad
commit 6e32abbfc2
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-12 Tom Tromey <tromey@redhat.com>
* java/io/natFilePosix.cc (getCanonicalPath): Treat "" like ".".
Fixes PR libgcj/6652.
2002-06-10 Tom Tromey <tromey@redhat.com>
* java/lang/Class.h (Class::desiredAssertionStatus): Declare.

9
libjava/java/io/natFilePosix.cc
View File

@ -104,9 +104,16 @@ java::io::File::attr (jint query)
jstring
java::io::File::getCanonicalPath (void)
{
char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1);
// We use `+2' here because we might need to use `.' for our special
// case.
char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 2);
char buf2[MAXPATHLEN];
jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
// Special case: treat "" the same as ".".
if (total == 0)
buf[total++] = '.';
buf[total] = '\0';
#ifdef HAVE_REALPATH