From 5a08b6f6891d41865987d9b7d72b41f96fb3869e Mon Sep 17 00:00:00 2001 From: membar Date: Fri, 31 Oct 2003 03:02:47 +0000 Subject: [PATCH] PR libgcj/6652: * java/io/natFileWin32.cc (getCanonicalPath): Treat "" like ".". git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73115 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/java/io/natFileWin32.cc | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 10b7ab60..b6f7e23 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-10-30 Mohan Embar + + PR libgcj/6652: + * java/io/natFileWin32.cc (getCanonicalPath): Treat "" like ".". + 2003-10-30 Bryce McKinlay * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Don't use vtable diff --git a/libjava/java/io/natFileWin32.cc b/libjava/java/io/natFileWin32.cc index cee6b00..1559043 100644 --- a/libjava/java/io/natFileWin32.cc +++ b/libjava/java/io/natFileWin32.cc @@ -109,10 +109,15 @@ jstring java::io::File::getCanonicalPath (void) { JV_TEMP_UTF_STRING (cpath, path); + + // If the filename is blank, use the current directory. + const char* thepath = cpath.buf(); + if (*thepath == '\0') + thepath = "."; LPTSTR unused; char buf2[MAX_PATH]; - if(!GetFullPathName(cpath, MAX_PATH, buf2, &unused)) + if(!GetFullPathName(thepath, MAX_PATH, buf2, &unused)) throw new IOException (JvNewStringLatin1 ("GetFullPathName failed")); // FIXME: what encoding to assume for file names? This affects many -- 2.7.4