diff options
| author | membar <membar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-31 03:02:47 +0000 |
|---|---|---|
| committer | membar <membar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-31 03:02:47 +0000 |
| commit | 5a08b6f6891d41865987d9b7d72b41f96fb3869e (patch) | |
| tree | 38683066a305e6866f2377746940af6597e882da /libjava | |
| parent | 6f2c2693f7ca65a692e88bcc8f74ca73e4462c37 (diff) | |
| download | ppe42-gcc-5a08b6f6891d41865987d9b7d72b41f96fb3869e.tar.gz ppe42-gcc-5a08b6f6891d41865987d9b7d72b41f96fb3869e.zip | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/io/natFileWin32.cc | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 10b7ab6085d..b6f7e23aa36 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-10-30 Mohan Embar <gnustuff@thisiscool.com> + + PR libgcj/6652: + * java/io/natFileWin32.cc (getCanonicalPath): Treat "" like ".". + 2003-10-30 Bryce McKinlay <bryce@mckinlay.net.nz> * 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 cee6b00ae1f..1559043e7ac 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 |
