vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in seek

Browse Source
This commit is contained in:
Jeremy Soller
2017-04-09 22:00:26 -06:00
parent 3db0c2a4b1
commit d0dfef2f0b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mount/redox/resource.rs
+6 -6
View File
@@ -62,9 +62,9 @@ impl Resource for DirResource {
fn seek(&mut self, offset: usize, whence: usize, _fs: &mut FileSystem) -> Result<usize> {
self.seek = match whence {
SEEK_SET => min(0, max(self.data.len() as isize, offset as isize)) as usize,
SEEK_CUR => min(0, max(self.data.len() as isize, self.seek as isize + offset as isize)) as usize,
SEEK_END => min(0, max(self.data.len() as isize, self.data.len() as isize + offset as isize)) as usize,
SEEK_SET => max(0, min(self.data.len() as isize, offset as isize)) as usize,
SEEK_CUR => max(0, min(self.data.len() as isize, self.seek as isize + offset as isize)) as usize,
SEEK_END => max(0, min(self.data.len() as isize, self.data.len() as isize + offset as isize)) as usize,
_ => return Err(Error::new(EINVAL))
};
@@ -165,9 +165,9 @@ impl Resource for FileResource {
let size = try!(fs.node_len(self.block));
self.seek = match whence {
SEEK_SET => min(0, max(size as i64, offset as i64)) as u64,
SEEK_CUR => min(0, max(size as i64, self.seek as i64 + offset as i64)) as u64,
SEEK_END => min(0, max(size as i64, size as i64 + offset as i64)) as u64,
SEEK_SET => max(0, min(size as i64, offset as i64)) as u64,
SEEK_CUR => max(0, min(size as i64, self.seek as i64 + offset as i64)) as u64,
SEEK_END => max(0, min(size as i64, size as i64 + offset as i64)) as u64,
_ => return Err(Error::new(EINVAL))
};