andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-22 08:06:17 +04:00
Code Issues Projects Releases Wiki Activity

fix trunc

Browse Source
This commit is contained in:
function2-llx 2020-04-20 13:06:14 +08:00
parent c5c0196a54
commit 2271bbd0e9
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kernel/src/syscall/fs.rs
View File

@ -513,10 +513,10 @@ impl Syscall<'_> {
fd, iov_ptr, iov_count
);
} else {
info!(
"writev: fd: {}, iov: {:?}, count: {}",
fd, iov_ptr, iov_count
);
// info!(
// "writev: fd: {}, iov: {:?}, count: {}",
// fd, iov_ptr, iov_count
// );
}
let iovs = unsafe { IoVecs::check_and_new(iov_ptr, iov_count, &self.vm(), false)? };
@ -554,6 +554,11 @@ impl Syscall<'_> {
if flags.contains(OpenFlags::EXCLUSIVE) {
return Err(SysError::EEXIST);
}
if flags.contains(OpenFlags::TRUNCATE) {
if let Err(e) = file_inode.resize(0) {
// TODO: do something? what about device file?
}
}
file_inode
}
Err(FsError::EntryNotFound) => {
@ -780,18 +785,10 @@ impl Syscall<'_> {
pub fn sys_dup2(&mut self, fd1: usize, fd2: usize) -> SysResult {
info!("dup2: from {} to {}", fd1, fd2);
let mut proc = self.process();
// close fd2 first if it is opened
proc.files.remove(&fd2);
let mut file_like = proc.get_file_like(fd1)?.dup(false);
proc.files.insert(fd2, file_like);
Ok(fd2)
self.dup_impl(fd1, fd2, 0)
}
// TODO: handle `flags`
pub fn sys_dup3(&mut self, fd1: usize, fd2: usize, flags: usize) -> SysResult {
info!("dup3: from {} to {}", fd1, fd2);
fn dup_impl(&mut self, fd1: usize, fd2: usize, flags: usize) -> SysResult {
let mut proc = self.process();
// close fd2 first if it is opened
proc.files.remove(&fd2);
@ -801,6 +798,11 @@ impl Syscall<'_> {
Ok(fd2)
}
pub fn sys_dup3(&mut self, fd1: usize, fd2: usize, flags: usize) -> SysResult {
info!("dup3: from {} to {} with flags = {:#x}", fd1, fd2, flags);
self.dup_impl(fd1, fd2, flags)
}
pub fn sys_ioctl(
&mut self,
fd: usize,
@ -1139,11 +1141,11 @@ impl Syscall<'_> {
Ok(0)
}
F_DUPFD_CLOEXEC => {
info!("dupfd_cloexec: arg: {:#x}", arg);
info!("fcntl: dupfd_cloexec: arg: {:#x}", arg);
// let file_like = proc.get_file_like(fd1)?.clone();
let new_fd = proc.get_free_fd_from(arg);
core::mem::drop(proc);
self.sys_dup3(fd, new_fd, 1)
self.dup_impl(fd, new_fd, 1)
}
_ => Ok(0),
}