RandomAccessFile.java (seek): Let seek go past end of file.

* java/io/RandomAccessFile.java (seek): Let seek go past end of
	file.
	(skipBytes): Don't fail if seeking past end of file.
	* java/io/FileInputStream.java (skip): Don't fail if seeking past
	end of file.
	* java/io/natFileDescriptorWin32.cc (seek): Handle `eof_trunc'
	argument.
	* java/io/natFileDescriptorEcos.cc (seek): Handle `eof_trunc'
	argument.
	* java/io/natFileDescriptorPosix.cc (seek): Handle `eof_trunc'
	argument.
	* java/io/FileDescriptor.java (seek): Added `eof_trunc' argument.

From-SVN: r44586
This commit is contained in:
Tom Tromey
2001-08-02 23:46:39 +00:00
committed by Tom Tromey
parent ead4cf347a
commit 8d6a437584
7 changed files with 43 additions and 23 deletions
+8 -4
View File
@@ -1,6 +1,6 @@
// natFileDescriptorWin32.cc - Native part of FileDescriptor class.
/* Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
/* Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.
This file is part of libgcj.
@@ -171,15 +171,19 @@ java::io::FileDescriptor::close (void)
}
jint
java::io::FileDescriptor::seek (jlong pos, jint whence)
java::io::FileDescriptor::seek (jlong pos, jint whence, jboolean eof_trunc)
{
JvAssert (whence == SET || whence == CUR);
jlong len = length();
jlong here = getFilePointer();
if ((whence == SET && pos > len) || (whence == CUR && here + pos > len))
throw new EOFException;
if (eof_trunc
&& ((whence == SET && pos > len) || (whence == CUR && here + pos > len)))
{
whence = SET;
pos = len;
}
LONG high = pos >> 32;
DWORD low = SetFilePointer ((HANDLE)fd, (DWORD)(0xffffffff & pos), &high, whence == SET ? FILE_BEGIN : FILE_CURRENT);