2003-05-13 Michael Koch <konqueror@gmx.de>
* java/io/FileDescriptor.java (SYNC): New constant. (DSYNC): Likewise. (getLength): Renamed from lenght() to match classpath's FileDescriptor.java. * java/io/RandomAccessFile.java (RandomAccessFile): Removed unneeded mode check, implemented mode "rws" and "rwd", merged documentation from classpath. (setLength): Reformatted. (length): Use new getLength() of FileDescriptor. * java/io/natFileDescriptorEcos.cc (getLength): Renamed from length(). * java/io/natFileDescriptorPosix.cc (open): Implemented support for SYNC and DSYNC. (seek): Use getLength() instead of length(). (getLength): Renamed from length(). * java/io/natFileDescriptorWin32.cc (getLength): Renamed from length(). (seek): Use getLength() instead of length(). (available): Likewise. * gnu/java/nio/natFileChannelImpl.cc (size): Use getLength() instead of length(). From-SVN: r66755
This commit is contained in:
parent
aa8f1f5793
commit
e48d8b8886
7 changed files with 61 additions and 21 deletions
|
@ -105,6 +105,12 @@ java::io::FileDescriptor::open (jstring path, jint jflags)
|
|||
}
|
||||
}
|
||||
|
||||
if ((jflags & SYNC))
|
||||
flags |= O_SYNC;
|
||||
|
||||
if ((jflags & DSYNC))
|
||||
flags |= O_DSYNC;
|
||||
|
||||
int fd = ::open (buf, flags, mode);
|
||||
if (fd == -1 && errno == EMFILE)
|
||||
{
|
||||
|
@ -233,7 +239,7 @@ java::io::FileDescriptor::seek (jlong pos, jint whence, jboolean eof_trunc)
|
|||
|
||||
if (eof_trunc)
|
||||
{
|
||||
jlong len = length ();
|
||||
jlong len = getLength ();
|
||||
if (whence == SET)
|
||||
{
|
||||
if (pos > len)
|
||||
|
@ -258,7 +264,7 @@ java::io::FileDescriptor::seek (jlong pos, jint whence, jboolean eof_trunc)
|
|||
}
|
||||
|
||||
jlong
|
||||
java::io::FileDescriptor::length (void)
|
||||
java::io::FileDescriptor::getLength (void)
|
||||
{
|
||||
struct stat sb;
|
||||
if (::fstat (fd, &sb))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue