mirror of
https://github.com/gcc-mirror/gcc.git
synced 2026-05-06 23:25:24 +02:00
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:
committed by
Michael Koch
parent
aa8f1f5793
commit
e48d8b8886
@@ -96,15 +96,17 @@ public class RandomAccessFile implements DataOutput, DataInput
|
||||
/**
|
||||
* This method initializes a new instance of <code>RandomAccessFile</code>
|
||||
* to read from the specified file name with the specified access mode.
|
||||
* The access mode is either "r" for read only access or "rw" for read
|
||||
* write access.
|
||||
* The access mode is either "r" for read only access, "rw" for read
|
||||
* write access, "rws" for synchronized read/write access of both
|
||||
* content and metadata, or "rwd" for read/write access
|
||||
* where only content is required to be synchronous.
|
||||
* <p>
|
||||
* Note that a <code>SecurityManager</code> check is made prior to
|
||||
* opening the file to determine whether or not this file is allowed to
|
||||
* be read or written.
|
||||
*
|
||||
* @param fileName The name of the file to read and/or write
|
||||
* @param mode "r" for read only or "rw" for read-write access to the file
|
||||
* @param mode "r", "rw", "rws", or "rwd"
|
||||
*
|
||||
* @exception IllegalArgumentException If <code>mode</code> has an
|
||||
* illegal value
|
||||
@@ -115,16 +117,21 @@ public class RandomAccessFile implements DataOutput, DataInput
|
||||
public RandomAccessFile (String fileName, String mode)
|
||||
throws FileNotFoundException
|
||||
{
|
||||
// Check the mode
|
||||
if (!mode.equals("r") && !mode.equals("rw") && !mode.equals("rws") &&
|
||||
!mode.equals("rwd"))
|
||||
throw new IllegalArgumentException("Bad mode value: " + mode);
|
||||
|
||||
int fdmode;
|
||||
if (mode.compareTo ("r") == 0)
|
||||
if (mode.equals("r"))
|
||||
fdmode = FileDescriptor.READ;
|
||||
else if (mode.compareTo ("rw") == 0)
|
||||
else if (mode.equals("rw"))
|
||||
fdmode = FileDescriptor.READ | FileDescriptor.WRITE;
|
||||
else if (mode.equals("rws"))
|
||||
{
|
||||
fdmode = (FileDescriptor.READ | FileDescriptor.WRITE
|
||||
| FileDescriptor.SYNC);
|
||||
}
|
||||
else if (mode.equals("rwd"))
|
||||
{
|
||||
fdmode = (FileDescriptor.READ | FileDescriptor.WRITE
|
||||
| FileDescriptor.DSYNC);
|
||||
}
|
||||
else
|
||||
throw new IllegalArgumentException ("invalid mode: " + mode);
|
||||
|
||||
@@ -197,9 +204,9 @@ public class RandomAccessFile implements DataOutput, DataInput
|
||||
*
|
||||
* @exception IOException If an error occurs
|
||||
*/
|
||||
public void setLength (long pos) throws IOException
|
||||
public void setLength (long newLen) throws IOException
|
||||
{
|
||||
fd.setLength(pos);
|
||||
fd.setLength (newLen);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -211,7 +218,7 @@ public class RandomAccessFile implements DataOutput, DataInput
|
||||
*/
|
||||
public long length () throws IOException
|
||||
{
|
||||
return fd.length();
|
||||
return fd.getLength ();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user