diff options
Diffstat (limited to 'libjava/java/io')
| -rw-r--r-- | libjava/java/io/File.java | 4 | ||||
| -rw-r--r-- | libjava/java/io/natFile.cc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index fa098e2..fd96501 100644 --- a/libjava/java/io/File.java +++ b/libjava/java/io/File.java @@ -108,9 +108,7 @@ public class File implements Serializable public String getName () { int last = path.lastIndexOf(separatorChar); - if (last == -1) - last = 0; - return path.substring(last); + return path.substring(last + 1); } public String getParent () diff --git a/libjava/java/io/natFile.cc b/libjava/java/io/natFile.cc index 40f2277..9b9a4af 100644 --- a/libjava/java/io/natFile.cc +++ b/libjava/java/io/natFile.cc @@ -105,7 +105,7 @@ java::io::File::attr (jstring canon, jint query) JvAssert (query == MODIFIED || query == LENGTH); // FIXME: time computation is very POSIX-specific -- POSIX and Java // have the same Epoch. - return query == MODIFIED ? sb.st_mtime * 1000 : sb.st_size; + return query == MODIFIED ? (jlong)sb.st_mtime * 1000 : sb.st_size; #else // There's no good choice here. return 23; |