diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/io/natFileWin32.cc | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ec7030b..1f871dc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-10-23 Ranjit Mathew <rmathew@hotmail.com> + + * java/io/natFileWin32.cc (attr): Use FindFirstFile( ) instead of + GetFileAttributesEx( ) to find file length and modification times, + as the latter is not present on Windows 95. + 2002-10-21 Michael Koch <konqueror@gmx.de> * java/net/URL.java diff --git a/libjava/java/io/natFileWin32.cc b/libjava/java/io/natFileWin32.cc index af95501..ebdaeab 100644 --- a/libjava/java/io/natFileWin32.cc +++ b/libjava/java/io/natFileWin32.cc @@ -83,10 +83,13 @@ java::io::File::attr (jint query) JvAssert (query == MODIFIED || query == LENGTH); - WIN32_FILE_ATTRIBUTE_DATA info; - if (! GetFileAttributesEx(buf, GetFileExInfoStandard, &info)) + WIN32_FIND_DATA info; + HANDLE sHandle; + if ( ( sHandle = FindFirstFile( buf, &info)) == INVALID_HANDLE_VALUE) return 0; - + + FindClose( sHandle); + if (query == LENGTH) return ((long long)info.nFileSizeHigh) << 32 | (unsigned long long)info.nFileSizeLow; else { |