Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/axfs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ log = "=0.4.21"
cfg-if = "1.0"
lazyinit = "0.2"
cap_access = "0.1"
axio = { version = "0.1", features = ["alloc"] }
axio = { version = "0.1.1", features = ["alloc"] }
axerrno = "0.1"
axfs_vfs = "0.1"
spin = "0.9"
Expand Down
11 changes: 10 additions & 1 deletion modules/axfs/src/api/file.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use axio::{Result, SeekFrom, prelude::*};
use alloc::vec::Vec;
use axio::{Result, SeekFrom, default_read_to_end, prelude::*};
use core::fmt;

use crate::fops;
Expand Down Expand Up @@ -174,6 +175,14 @@ impl Read for File {
fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
self.inner.read(buf)
}

fn read_to_end(&mut self, buf: &mut Vec<u8>) -> Result<usize> {
default_read_to_end(
self,
buf,
self.metadata().ok().map(|metadata| metadata.size() as _),
)
}
}

impl Write for File {
Expand Down
Loading