From 8a15dbc6c0cfe2358148ef7bec099afdf4db4ca0 Mon Sep 17 00:00:00 2001 From: Harry Cheng Date: Tue, 15 Oct 2019 20:49:09 +0800 Subject: [PATCH] Update python --- kernel/src/process/structs.rs | 2 +- kernel/src/syscall/fs.rs | 2 +- user | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/src/process/structs.rs b/kernel/src/process/structs.rs index c9c55a4..953194a 100644 --- a/kernel/src/process/structs.rs +++ b/kernel/src/process/structs.rs @@ -146,7 +146,7 @@ impl Thread { ) -> Result<(MemorySet, usize, usize), &'static str> { // Read ELF header // 0x3c0: magic number from ld-musl.so - let mut data: [u8; 0x3c0] = unsafe { MaybeUninit::uninit().assume_init() }; + let mut data: [u8; 6000] = unsafe { MaybeUninit::uninit().assume_init() }; inode .read_at(0, &mut data) .map_err(|_| "failed to read from INode")?; diff --git a/kernel/src/syscall/fs.rs b/kernel/src/syscall/fs.rs index 65f83d3..d62ef8d 100644 --- a/kernel/src/syscall/fs.rs +++ b/kernel/src/syscall/fs.rs @@ -510,7 +510,6 @@ impl Syscall<'_> { Err(FsError::EntryNotFound) => break, r => r, }?; - debug!("getdents64: got {}", entry.1); let ok = writer.try_write(entry.0 as u64, DirentType::from_type(&info.type_).bits(), &entry.1); if !ok { break; @@ -914,6 +913,7 @@ impl Process { } _ => {} } + let (fd_dir_path, fd_name) = split_path(&path); match fd_dir_path { "/proc/self/fd" => { diff --git a/user b/user index b055c8d..71ab876 160000 --- a/user +++ b/user @@ -1 +1 @@ -Subproject commit b055c8df6258bc887e121d40979816fa578cc00a +Subproject commit 71ab876cf51a85f81d1c10f1ef4100a4b2981296