PatchSet 4743
Date: 2004/05/18 03:34:50
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: java.io
2004-05-18 Dalibor Topic <[EMAIL PROTECTED]>
* include/Makefile.am:
(NOINSTALL_DERIVED_HDRS) Added java_io_VMFile.h.
* include/Makefile.in: Regenerated.
* libraries/clib/io/File.c:
Changed signatures to match VMFile.
* libraries/javalib/Klasses.jar.bootstrap,
libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in:
Regenerated.
* libraries/javalib/bootstrap.classlist:
Added java/io/VMFile.class.
* libraries/javalib/essential.files:
Added java/io/VMFile.java.
* libraries/javalib/java/io/ByteArrayInputStream.java,
libraries/javalib/java/io/CharArrayWriter.java,
libraries/javalib/java/io/DataInput.java,
libraries/javalib/java/io/File.java,
libraries/javalib/java/io/FileDescriptor.java,
libraries/javalib/java/io/FilePermission.java,
libraries/javalib/java/io/FilterInputStream.java,
libraries/javalib/java/io/InputStream.java,
libraries/javalib/java/io/InputStreamReader.java,
libraries/javalib/java/io/ObjectStreamClass.java,
libraries/javalib/java/io/ObjectStreamField.java,
libraries/javalib/java/io/OutputStreamWriter.java,
libraries/javalib/java/io/PipedInputStream.java,
libraries/javalib/java/io/PipedReader.java,
libraries/javalib/java/io/PushbackInputStream.java,
libraries/javalib/java/io/RandomAccessFile.java,
libraries/javalib/java/io/SerializablePermission.java,
libraries/javalib/java/io/StreamTokenizer.java,
libraries/javalib/java/io/StringWriter.java,
libraries/javalib/java/io/VMObjectStreamClass.java,
libraries/javalib/java/io/WriteAbortedException.java,
libraries/javalib/java/io/Writer.java:
Resynced with GNU Classpath.
2004-05-14 Mark Wielaard <[EMAIL PROTECTED]>
* java/io/Writer.java (Writer(Object)): Check for null lock object.
2004-04-12 Michael Koch <[EMAIL PROTECTED]>
* java/io/CharArrayWriter.java,
java/io/PipedInputStream.java,
java/io/PipedReader.java,
java/io/SerializablePermission.java,
java/io/StreamTokenizer.java,
java/io/WriteAbortedException.java:
Fixed HTML in javadocs.
2004-04-20 Michael Koch <[EMAIL PROTECTED]>
* java/io/StringWriter.java
(close): Fixed typo in javadoc.
2004-04-30 Mark Wielaard <[EMAIL PROTECTED]>
* java/io/RandomAccessFile.java (setLength): Use truncate for
shrinking the file and seek plus write for expanding the file.
2004-04-29 Mark Wielaard <[EMAIL PROTECTED]>
* java/io/RandomAccessFile.java (setLength): Set position to new
length when new length is smaller then current position.
2004-04-17 Michael Koch <[EMAIL PROTECTED]>
* java/io/DataInput.java,
java/io/File.java,
java/io/InputStream.java,
java/io/InputStreamReader.java,
java/io/PushbackInputStream.java,
java/io/RandomAccessFile.java:
Fixed javadocs all over.
004-04-23 Mark Wielaard <[EMAIL PROTECTED]>
* java/io/OutputStreamWriter.java (getEncoding): Return null when
out == null, otherwise call out.getSchemeName.
2004-04-28 Tom Tromey <[EMAIL PROTECTED]>
* java/io/ObjectStreamField.java: Cleaned up imports.
* java/io/BufferedReader.java (skip): Removed unused
variable.
2004-04-08 Michael Koch <[EMAIL PROTECTED]>
* java/io/ByteArrayInputStream.java,
java/io/DataInput.java,
java/io/DataInputStream.java,
java/io/InputStream.java,
java/io/InputStreamReader.java,
java/io/ObjectStreamClass.java,
java/io/ObjectStreamField.java,
java/io/PushbackReader.java,
java/io/StringWriter.java,
java/io/Writer.java:
Fixed javadocs and style all over.
2004-04-06 Guilhem Lavaux <[EMAIL PROTECTED]>
* java/io/ObjectStreamField.java
(setBooleanField, setCharField, setByteField, setShortField,
setIntField, setLongField, setFloatField, setDoubleField,
setObjectField): Use native methods directly to be able to set
final fields.
* vm/reference/java/io/VMObjectStreamClass.java
(setBooleanNative, setCharNative, setByteNative, setShortNative,
setIntNative, setLongNative, setFloatNative, setDoubleNative,
setObjectNative): New methods for serialization to be able to
set final fields.
2004-04-23 Tom Tromey <[EMAIL PROTECTED]>
* java/io/FilePermission.java (implies): Removed unused
variable.
2004-04-09 Jeroen Frijters <[EMAIL PROTECTED]>
* java/io/FileDescriptor.java: (FileDescriptor) Added public
constructor. (valid) Added null check.
2004-04-18 Mark Wielaard <[EMAIL PROTECTED]>
* java/io/File.java (canWrite): Only do checkWrite() security
check, use internal methods for actual actions.
(createTempFile): Don't do security checks for temp files that
won't be created.
(setReadOnly): Do checkWrite() security check before trying to
do anything else.
(renameTo): Add checkWrite() security check for destination file.
2004-04-20 Jeroen Frijters <[EMAIL PROTECTED]>
* java/io/File.java
(toURL): Correct the file path before constructing the URL.
2004-04-26 Michael Koch <[EMAIL PROTECTED]>
* java/io/File.java: Moved all native methods to the new class
VMFile and removed the Internal suffix.
* vm/reference/java/io/VMFile.java: New file.
2004-04-30 Tom Tromey <[EMAIL PROTECTED]>
Mark Wielaard <[EMAIL PROTECTED]>
* java/io/File.java (toURI): New method.
(toURL): Use isDirectory() directly.
2004-05-05 Michael Koch <[EMAIL PROTECTED]>
* java/io/File.java
(getParent): Fixed javadoc.
Members:
ChangeLog:1.2317->1.2318
include/Makefile.am:1.58->1.59
include/Makefile.in:1.155->1.156
libraries/clib/io/File.c:1.22->1.23
libraries/javalib/Klasses.jar.bootstrap:1.56->1.57
libraries/javalib/Makefile.am:1.184->1.185
libraries/javalib/Makefile.in:1.247->1.248
libraries/javalib/bootstrap.classlist:1.47->1.48
libraries/javalib/essential.files:1.43->1.44
libraries/javalib/java/io/ByteArrayInputStream.java:1.5->1.6
libraries/javalib/java/io/CharArrayWriter.java:1.8->1.9
libraries/javalib/java/io/DataInput.java:1.7->1.8
libraries/javalib/java/io/File.java:1.45->1.46
libraries/javalib/java/io/FileDescriptor.java:1.7->1.8
libraries/javalib/java/io/FilePermission.java:1.7->1.8
libraries/javalib/java/io/FilterInputStream.java:1.11->1.12
libraries/javalib/java/io/InputStream.java:1.11->1.12
libraries/javalib/java/io/InputStreamReader.java:1.15->1.16
libraries/javalib/java/io/ObjectStreamClass.java:1.22->1.23
libraries/javalib/java/io/ObjectStreamField.java:1.11->1.12
libraries/javalib/java/io/OutputStreamWriter.java:1.10->1.11
libraries/javalib/java/io/PipedInputStream.java:1.13->1.14
libraries/javalib/java/io/PipedReader.java:1.8->1.9
libraries/javalib/java/io/PushbackInputStream.java:1.6->1.7
libraries/javalib/java/io/RandomAccessFile.java:1.24->1.25
libraries/javalib/java/io/SerializablePermission.java:1.2->1.3
libraries/javalib/java/io/StreamTokenizer.java:1.23->1.24
libraries/javalib/java/io/StringWriter.java:1.8->1.9
libraries/javalib/java/io/VMObjectStreamClass.java:1.3->1.4
libraries/javalib/java/io/WriteAbortedException.java:1.5->1.6
libraries/javalib/java/io/Writer.java:1.8->1.9
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2317 kaffe/ChangeLog:1.2318
--- kaffe/ChangeLog:1.2317 Tue May 18 01:10:25 2004
+++ kaffe/ChangeLog Tue May 18 03:34:50 2004
@@ -1,5 +1,170 @@
2004-05-18 Dalibor Topic <[EMAIL PROTECTED]>
+ * include/Makefile.am:
+ (NOINSTALL_DERIVED_HDRS) Added java_io_VMFile.h.
+
+ * include/Makefile.in: Regenerated.
+
+ * libraries/clib/io/File.c:
+ Changed signatures to match VMFile.
+
+ * libraries/javalib/Klasses.jar.bootstrap,
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in:
+ Regenerated.
+
+ * libraries/javalib/bootstrap.classlist:
+ Added java/io/VMFile.class.
+
+ * libraries/javalib/essential.files:
+ Added java/io/VMFile.java.
+
+ * libraries/javalib/java/io/ByteArrayInputStream.java,
+ libraries/javalib/java/io/CharArrayWriter.java,
+ libraries/javalib/java/io/DataInput.java,
+ libraries/javalib/java/io/File.java,
+ libraries/javalib/java/io/FileDescriptor.java,
+ libraries/javalib/java/io/FilePermission.java,
+ libraries/javalib/java/io/FilterInputStream.java,
+ libraries/javalib/java/io/InputStream.java,
+ libraries/javalib/java/io/InputStreamReader.java,
+ libraries/javalib/java/io/ObjectStreamClass.java,
+ libraries/javalib/java/io/ObjectStreamField.java,
+ libraries/javalib/java/io/OutputStreamWriter.java,
+ libraries/javalib/java/io/PipedInputStream.java,
+ libraries/javalib/java/io/PipedReader.java,
+ libraries/javalib/java/io/PushbackInputStream.java,
+ libraries/javalib/java/io/RandomAccessFile.java,
+ libraries/javalib/java/io/SerializablePermission.java,
+ libraries/javalib/java/io/StreamTokenizer.java,
+ libraries/javalib/java/io/StringWriter.java,
+ libraries/javalib/java/io/VMObjectStreamClass.java,
+ libraries/javalib/java/io/WriteAbortedException.java,
+ libraries/javalib/java/io/Writer.java:
+ Resynced with GNU Classpath.
+
+ 2004-05-14 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * java/io/Writer.java (Writer(Object)): Check for null lock object.
+
+ 2004-04-12 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/io/CharArrayWriter.java,
+ java/io/PipedInputStream.java,
+ java/io/PipedReader.java,
+ java/io/SerializablePermission.java,
+ java/io/StreamTokenizer.java,
+ java/io/WriteAbortedException.java:
+ Fixed HTML in javadocs.
+
+ 2004-04-20 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/io/StringWriter.java
+ (close): Fixed typo in javadoc.
+
+ 2004-04-30 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * java/io/RandomAccessFile.java (setLength): Use truncate for
+ shrinking the file and seek plus write for expanding the file.
+
+ 2004-04-29 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * java/io/RandomAccessFile.java (setLength): Set position to new
+ length when new length is smaller then current position.
+
+ 2004-04-17 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/io/DataInput.java,
+ java/io/File.java,
+ java/io/InputStream.java,
+ java/io/InputStreamReader.java,
+ java/io/PushbackInputStream.java,
+ java/io/RandomAccessFile.java:
+ Fixed javadocs all over.
+
+ 004-04-23 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * java/io/OutputStreamWriter.java (getEncoding): Return null when
+ out == null, otherwise call out.getSchemeName.
+
+ 2004-04-28 Tom Tromey <[EMAIL PROTECTED]>
+
+ * java/io/ObjectStreamField.java: Cleaned up imports.
+ * java/io/BufferedReader.java (skip): Removed unused
+ variable.
+
+ 2004-04-08 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/io/ByteArrayInputStream.java,
+ java/io/DataInput.java,
+ java/io/DataInputStream.java,
+ java/io/InputStream.java,
+ java/io/InputStreamReader.java,
+ java/io/ObjectStreamClass.java,
+ java/io/ObjectStreamField.java,
+ java/io/PushbackReader.java,
+ java/io/StringWriter.java,
+ java/io/Writer.java:
+ Fixed javadocs and style all over.
+
+ 2004-04-06 Guilhem Lavaux <[EMAIL PROTECTED]>
+
+ * java/io/ObjectStreamField.java
+ (setBooleanField, setCharField, setByteField, setShortField,
+ setIntField, setLongField, setFloatField, setDoubleField,
+ setObjectField): Use native methods directly to be able to set
+ final fields.
+
+ * vm/reference/java/io/VMObjectStreamClass.java
+ (setBooleanNative, setCharNative, setByteNative, setShortNative,
+ setIntNative, setLongNative, setFloatNative, setDoubleNative,
+ setObjectNative): New methods for serialization to be able to
+ set final fields.
+
+ 2004-04-23 Tom Tromey <[EMAIL PROTECTED]>
+
+ * java/io/FilePermission.java (implies): Removed unused
+ variable.
+
+ 2004-04-09 Jeroen Frijters <[EMAIL PROTECTED]>
+
+ * java/io/FileDescriptor.java: (FileDescriptor) Added public
+ constructor. (valid) Added null check.
+
+ 2004-04-18 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * java/io/File.java (canWrite): Only do checkWrite() security
+ check, use internal methods for actual actions.
+ (createTempFile): Don't do security checks for temp files that
+ won't be created.
+ (setReadOnly): Do checkWrite() security check before trying to
+ do anything else.
+ (renameTo): Add checkWrite() security check for destination file.
+
+ 2004-04-20 Jeroen Frijters <[EMAIL PROTECTED]>
+
+ * java/io/File.java
+ (toURL): Correct the file path before constructing the URL.
+
+ 2004-04-26 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/io/File.java: Moved all native methods to the new class
+ VMFile and removed the "Internal" suffix.
+ * vm/reference/java/io/VMFile.java: New file.
+
+ 2004-04-30 Tom Tromey <[EMAIL PROTECTED]>
+ Mark Wielaard <[EMAIL PROTECTED]>
+
+ * java/io/File.java (toURI): New method.
+ (toURL): Use isDirectory() directly.
+
+ 2004-05-05 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/io/File.java
+ (getParent): Fixed javadoc.
+
+2004-05-18 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/lang/CharSequence.java,
libraries/javalib/java/lang/Compiler.java,
libraries/javalib/java/lang/Number.java,
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.58 kaffe/include/Makefile.am:1.59
--- kaffe/include/Makefile.am:1.58 Thu Apr 22 09:22:37 2004
+++ kaffe/include/Makefile.am Tue May 18 03:34:52 2004
@@ -50,9 +50,10 @@
java_io_InputStream.h \
java_io_InterruptedIOException.h \
java_io_ObjectInputStream.h \
- java_io_VMObjectStreamClass.h \
java_io_PrintStream.h \
java_io_RandomAccessFile.h \
+ java_io_VMFile.h \
+ java_io_VMObjectStreamClass.h \
java_lang_Boolean.h \
java_lang_Byte.h \
java_lang_Character.h \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.155 kaffe/include/Makefile.in:1.156
--- kaffe/include/Makefile.in:1.155 Mon Apr 26 16:47:54 2004
+++ kaffe/include/Makefile.in Tue May 18 03:34:52 2004
@@ -362,9 +362,10 @@
java_io_InputStream.h \
java_io_InterruptedIOException.h \
java_io_ObjectInputStream.h \
- java_io_VMObjectStreamClass.h \
java_io_PrintStream.h \
java_io_RandomAccessFile.h \
+ java_io_VMFile.h \
+ java_io_VMObjectStreamClass.h \
java_lang_Boolean.h \
java_lang_Byte.h \
java_lang_Character.h \
Index: kaffe/libraries/clib/io/File.c
diff -u kaffe/libraries/clib/io/File.c:1.22 kaffe/libraries/clib/io/File.c:1.23
--- kaffe/libraries/clib/io/File.c:1.22 Sun Apr 18 13:57:28 2004
+++ kaffe/libraries/clib/io/File.c Tue May 18 03:34:53 2004
@@ -25,15 +25,14 @@
#include "defs.h"
#include "files.h"
#include "../../../include/system.h"
-#include "java_io_File.h"
+#include "java_io_VMFile.h"
#include "../../../kaffe/kaffevm/support.h"
#include "../../../kaffe/kaffevm/stringSupport.h"
/*
* Is named item a file?
*/
-jboolean java_io_File_isFileInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName)
+jboolean java_io_VMFile_isFile(struct Hjava_lang_String* fileName)
{
struct stat buf;
char str[MAXPATHLEN];
@@ -53,8 +52,7 @@
/*
* Is named item a directory?
*/
-jboolean java_io_File_isDirectoryInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName)
+jboolean java_io_VMFile_isDirectory(struct Hjava_lang_String* fileName)
{
struct stat buf;
char str[MAXPATHLEN];
@@ -74,8 +72,7 @@
/*
* Does named file exist?
*/
-jboolean java_io_File_existsInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName)
+jboolean java_io_VMFile_exists(struct Hjava_lang_String* fileName)
{
struct stat buf;
char str[MAXPATHLEN];
@@ -89,8 +86,7 @@
/*
* Last modified time on file.
*/
-jlong java_io_File_lastModifiedInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName)
+jlong java_io_VMFile_lastModified(struct Hjava_lang_String* fileName)
{
struct stat buf;
char str[MAXPATHLEN];
@@ -109,8 +105,7 @@
* Can I write to this file?
*/
jboolean
-java_io_File_canWriteInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName)
+java_io_VMFile_canWrite(struct Hjava_lang_String* fileName)
{
char str[MAXPATHLEN];
int r;
@@ -124,8 +119,7 @@
/*
* Can I read from this file.
*/
-jboolean java_io_File_canReadInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName)
+jboolean java_io_VMFile_canRead(struct Hjava_lang_String* fileName)
{
char str[MAXPATHLEN];
int r;
@@ -139,8 +133,7 @@
/*
* Return length of file.
*/
-jlong java_io_File_lengthInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName)
+jlong java_io_VMFile_length(struct Hjava_lang_String* fileName)
{
struct stat buf;
char str[MAXPATHLEN];
@@ -158,8 +151,7 @@
/*
* Create a directory.
*/
-jboolean java_io_File_mkdirInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName)
+jboolean java_io_VMFile_mkdir(struct Hjava_lang_String* fileName)
{
char str[MAXPATHLEN];
int r;
@@ -172,9 +164,8 @@
/*
* Rename a file.
*/
-jboolean java_io_File_renameToInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fromName,
- struct Hjava_lang_String* toName)
+jboolean java_io_VMFile_renameTo(struct Hjava_lang_String* fromName,
+ struct Hjava_lang_String* toName)
{
char str[MAXPATHLEN];
char str2[MAXPATHLEN];
@@ -190,15 +181,14 @@
/*
* Delete a file.
*/
-jboolean java_io_File_deleteInternal(struct Hjava_io_File* this,
- struct Hjava_lang_String* fileName)
+jboolean java_io_VMFile_delete(struct Hjava_lang_String* fileName)
{
char str[MAXPATHLEN];
int r;
stringJava2CBuf(fileName, str, sizeof(str));
- if (java_io_File_isDirectoryInternal(this, fileName))
+ if (java_io_VMFile_isDirectory(fileName))
r = KRMDIR(str);
else
r = KREMOVE(str);
@@ -208,8 +198,7 @@
/*
* Get a directory listing.
*/
-HArrayOfObject* java_io_File_listInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* dirName)
+HArrayOfObject* java_io_VMFile_list(struct Hjava_lang_String* dirName)
{
#if defined(HAVE_DIRENT_H)
char path[MAXPATHLEN];
@@ -290,7 +279,7 @@
#endif
}
-jboolean java_io_File_createInternal(struct Hjava_lang_String* fileName)
+jboolean java_io_VMFile_create(struct Hjava_lang_String* fileName)
{
char str[MAXPATHLEN];
int fd;
@@ -313,9 +302,8 @@
return 1;
}
-jboolean java_io_File_setLastModifiedInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName,
- jlong thetime)
+jboolean java_io_VMFile_setLastModified(struct Hjava_lang_String* fileName,
+ jlong thetime)
{
#ifdef HAVE_UTIME_H
char path[MAXPATHLEN];
@@ -334,8 +322,7 @@
#endif
}
-jboolean java_io_File_setReadOnlyInternal(struct Hjava_io_File* this UNUSED,
- struct Hjava_lang_String* fileName)
+jboolean java_io_VMFile_setReadOnly(struct Hjava_lang_String* fileName)
{
struct stat buf;
char str[MAXPATHLEN];
Index: kaffe/libraries/javalib/Klasses.jar.bootstrap
cvs rdiff: failed to read diff file header /tmp/cvsrRzNjW for Klasses.jar.bootstrap,v:
end of file
system command returned non-zero exit status: 1: aborting
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
