DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-18 08:06:32 +00:00
Code Issues Releases Wiki Activity

🆕 cat命令

Browse Source
This commit is contained in:
fslongjin
2022-05-30 17:39:45 +08:00
parent 9ee6d33318
commit 85707bd8cc
7 changed files with 99 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/filesystem/fat32/fat32.c
View File

@ -336,8 +336,8 @@ find_lookup_success:; // 找到目标dentry
finode->first_clus = ((tmp_dEntry->DIR_FstClusHI << 16) | tmp_dEntry->DIR_FstClusLO) & 0x0fffffff;
finode->dEntry_location_clus = cluster;
finode->dEntry_location_clus_offset = tmp_dEntry - (struct fat32_Directory_t *)buf; //计算dentry的偏移量
kdebug("finode->dEntry_location_clus=%#018lx", finode->dEntry_location_clus);
kdebug("finode->dEntry_location_clus_offset=%#018lx", finode->dEntry_location_clus_offset);
// kdebug("finode->dEntry_location_clus=%#018lx", finode->dEntry_location_clus);
// kdebug("finode->dEntry_location_clus_offset=%#018lx", finode->dEntry_location_clus_offset);
finode->create_date = tmp_dEntry->DIR_CrtDate;
finode->create_time = tmp_dEntry->DIR_CrtTime;
finode->write_date = tmp_dEntry->DIR_WrtDate;
@ -1079,11 +1079,11 @@ find_dir_success:;
// 将文件夹位置坐标加32（即指向下一个目录项）
file_ptr->position += 32;
// todo: 计算ino_t
if(dentry_type & ATTR_DIRECTORY)
if (dentry_type & ATTR_DIRECTORY)
dentry_type = VFS_ATTR_DIR;
else
dentry_type = VFS_ATTR_FILE;
return filler(dirent, 0, dir_name, name_len, dentry_type, 0);
}

2
kernel/syscall/syscall.c
View File

@ -340,7 +340,7 @@ uint64_t sys_lseek(struct pt_regs *regs)
long offset = (long)regs->r9;
int whence = (int)regs->r10;
kdebug("sys_lseek: fd=%d", fd_num);
// kdebug("sys_lseek: fd=%d", fd_num);
uint64_t retval = 0;
// 校验文件描述符范围