dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-06-11 18:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

count up position and add aCount correction if to great on Read() in FatStream

Browse source
This commit is contained in:
Trivalik_cp 2011-06-12 13:47:25 +00:00
parent 20ef289111
commit 99e0bf99d4
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source2/Kernel/System/Cosmos.System/Filesystem/FAT/FatStream.cs
View file

@ -58,16 +58,23 @@ namespace Cosmos.System.Filesystem.FAT {
public override int Read(byte[] aBuffer, int aOffset, int aCount) {
if (aOffset < 0 || aCount < 0) {
throw new ArgumentOutOfRangeException();
} else if (aOffset >= mFile.Size) {
throw new ArgumentException();
}
else if(aBuffer == null || aBuffer.Length - aOffset < aCount) {
throw new ArgumentException("Invalid offset length!");
} else if (mFile.FirstClusterNum == 0) {
// FirstSector can be 0 for 0 length files
return 0;
} else if (aOffset == mFile.Size) {
} else if (mPosition == mFile.Size) {
// EOF
return 0;
}
// reduce count, so that no out of bound exception occurs if not existing
// entry is used in line mFS.ReadCluster(mFatTable[(int)xClusterIdx], xCluster);
uint xMaxReadableBytes = mFile.Size - mPosition;
if (aCount > xMaxReadableBytes)
aCount = (int)xMaxReadableBytes;
var xCluster = mFS.NewClusterArray();
UInt32 xClusterSize = mFS.BytesPerCluster;
@ -88,8 +95,9 @@ namespace Cosmos.System.Filesystem.FAT {
aCount = aCount - xReadSize;
}
mPosition += (uint)aOffset;
return (int)aOffset;
}
}
public override void Flush() {
throw new NotImplementedException();
@ -106,6 +114,5 @@ namespace Cosmos.System.Filesystem.FAT {
public override void Write(byte[] buffer, int offset, int count) {
throw new NotImplementedException();
}
}
}
}