diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-07-26 02:51:44 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-07-26 02:51:44 +0000 |
| commit | 9f1cff95c74ba3d70746b21f09cfb419cfe9e27c (patch) | |
| tree | 41653eeceacd1252434a7f1e6a81fc4ca6638997 /libjava/java/io | |
| parent | 55f54832950e372daa1c7f4fb3b555ee70489251 (diff) | |
| download | ppe42-gcc-9f1cff95c74ba3d70746b21f09cfb419cfe9e27c.tar.gz ppe42-gcc-9f1cff95c74ba3d70746b21f09cfb419cfe9e27c.zip | |
1999-07-22 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/natString.cc (substring): optimize where substring is
entire String.
* java/io/File.java (getName): don't return separator with file name.
* java/io/natFile.cc (attr): fix overflow.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28246 138bc75d-0d04-0410-961f-82ee72b054a4
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 fa098e26bf5..fd96501cf25 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 40f227719e5..9b9a4affea6 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; |
