mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-18 12:16:31 +00:00
新版文件系统重构完成 (#198)
1.重构：VFS 2. 重构：ProcFS 3. 重构：DevFS 4. 重构：FAT32 5. 重构：AHCI驱动 6. 新增：RamFS 7. 新增：MountFS 8. 新增：FAT12 9. 新增：FAT16 10. 重构：设备抽象 Co-authored-by: guanjinquan <1666320330@qq.com> Co-authored-by: DaJiYuQia <88259094+DaJiYuQia@users.noreply.github.com>
This commit is contained in:
login
GitHub
@ -4,6 +4,7 @@
|
||||
#include <dirent.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <libsystem/syscall.h>
|
||||
#include <signal.h>
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
@ -12,7 +13,6 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#include <libsystem/syscall.h>
|
||||
|
||||
// 当前工作目录（在main_loop中初始化）
|
||||
char *shell_current_path = NULL;
|
||||
@ -68,7 +68,7 @@ static char *get_target_filepath(const char *filename, int *result_path_len)
|
||||
memset(file_path, 0, *result_path_len + 2);
|
||||
|
||||
strncpy(file_path, filename, *result_path_len);
|
||||
if(filename[(*result_path_len)-1]!='/')
|
||||
if (filename[(*result_path_len) - 1] != '/')
|
||||
file_path[*result_path_len] = '/';
|
||||
}
|
||||
|
||||
@ -258,11 +258,11 @@ int shell_cmd_ls(int argc, char **argv)
|
||||
break;
|
||||
|
||||
int color = COLOR_WHITE;
|
||||
if (buf->d_type & VFS_IF_DIR)
|
||||
if (buf->d_type == DT_DIR)
|
||||
color = COLOR_YELLOW;
|
||||
else if (buf->d_type & VFS_IF_FILE)
|
||||
else if (buf->d_type == DT_REG)
|
||||
color = COLOR_INDIGO;
|
||||
else if (buf->d_type & VFS_IF_DEVICE)
|
||||
else if (buf->d_type == DT_BLK || buf->d_type == DT_CHR)
|
||||
color = COLOR_GREEN;
|
||||
|
||||
char output_buf[256] = {0};
|
||||
@ -315,9 +315,10 @@ int shell_cmd_cat(int argc, char **argv)
|
||||
lseek(fd, 0, SEEK_SET);
|
||||
|
||||
char *buf = (char *)malloc(512);
|
||||
memset(buf, 0, 512);
|
||||
|
||||
while (file_size > 0)
|
||||
{
|
||||
memset(buf, 0, 512);
|
||||
int l = read(fd, buf, 511);
|
||||
buf[l] = '\0';
|
||||
|
||||
|
||||
@ -90,7 +90,7 @@ void main_loop(int kb_fd)
|
||||
int main()
|
||||
{
|
||||
// 打开键盘文件
|
||||
char kb_file_path[] = "/dev/char/ps2.kb0";
|
||||
char kb_file_path[] = "/dev/char/ps2_keyboard";
|
||||
|
||||
int kb_fd = open(kb_file_path, 0);
|
||||
print_ascii_logo();
|
||||
|
||||
@ -5,15 +5,59 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief inode的属性（copy from vfs.h）
|
||||
/*
|
||||
* This is a header for the common implementation of dirent
|
||||
* to fs on-disk file type conversion. Although the fs on-disk
|
||||
* bits are specific to every file system, in practice, many
|
||||
* file systems use the exact same on-disk format to describe
|
||||
* the lower 3 file type bits that represent the 7 POSIX file
|
||||
* types.
|
||||
*
|
||||
* It is important to note that the definitions in this
|
||||
* header MUST NOT change. This would break both the
|
||||
* userspace ABI and the on-disk format of filesystems
|
||||
* using this code.
|
||||
*
|
||||
* All those file systems can use this generic code for the
|
||||
* conversions.
|
||||
*/
|
||||
#define VFS_IF_FILE (1UL << 0)
|
||||
#define VFS_IF_DIR (1UL << 1)
|
||||
#define VFS_IF_DEVICE (1UL << 2)
|
||||
|
||||
/*
|
||||
* struct dirent file types
|
||||
* exposed to user via getdents(2), readdir(3)
|
||||
*
|
||||
* These match bits 12..15 of stat.st_mode
|
||||
* (ie "(i_mode >> 12) & 15").
|
||||
*/
|
||||
|
||||
// 完整含义请见 http://www.gnu.org/software/libc/manual/html_node/Directory-Entries.html
|
||||
#define S_DT_SHIFT 12
|
||||
#define S_DT(mode) (((mode) & S_IFMT) >> S_DT_SHIFT)
|
||||
#define S_DT_MASK (S_IFMT >> S_DT_SHIFT)
|
||||
|
||||
/* these are defined by POSIX and also present in glibc's dirent.h */
|
||||
#define DT_UNKNOWN 0
|
||||
// 命名管道，或者FIFO
|
||||
#define DT_FIFO 1
|
||||
// 字符设备
|
||||
#define DT_CHR 2
|
||||
// 目录
|
||||
#define DT_DIR 4
|
||||
// 块设备
|
||||
#define DT_BLK 6
|
||||
// 常规文件
|
||||
#define DT_REG 8
|
||||
// 符号链接
|
||||
#define DT_LNK 10
|
||||
// 是一个socket
|
||||
#define DT_SOCK 12
|
||||
// 这个是抄Linux的，还不知道含义
|
||||
#define DT_WHT 14
|
||||
|
||||
#define DT_MAX (S_DT_MASK + 1) /* 16 */
|
||||
|
||||
#define DIR_BUF_SIZE 256
|
||||
|
||||
/**
|
||||
* @brief 文件夹结构体
|
||||
*
|
||||
|
||||
@ -10,63 +10,64 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
#if defined(__cplusplus)
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#define E2BIG 1 /* 参数列表过长，或者在输出buffer中缺少空间 或者参数比系统内建的最大值要大 Argument list too long. */
|
||||
#define EACCES 2 /* 访问被拒绝 Permission denied */
|
||||
#define EADDRINUSE 3 /* 地址正在被使用 Address in use.*/
|
||||
#define EADDRNOTAVAIL 4 /* 地址不可用 Address not available.*/
|
||||
#define EAFNOSUPPORT 5 /* 地址family不支持 Address family not supported. */
|
||||
#define EAGAIN 6 /* 资源不可用，请重试。 Resource unavailable, try again (may be the same value as [EWOULDBLOCK]).*/
|
||||
#define EALREADY 7 /* 连接已经在处理 Connection already in progress. */
|
||||
#define EBADF 8 /* 错误的文件描述符 Bad file descriptor. */
|
||||
#define EBADMSG 9 /* 错误的消息 Bad message. */
|
||||
#define E2BIG 1 /* 参数列表过长，或者在输出buffer中缺少空间 或者参数比系统内建的最大值要大 Argument list too long. */
|
||||
#define EACCES 2 /* 访问被拒绝 Permission denied */
|
||||
#define EADDRINUSE 3 /* 地址正在被使用 Address in use.*/
|
||||
#define EADDRNOTAVAIL 4 /* 地址不可用 Address not available.*/
|
||||
#define EAFNOSUPPORT 5 /* 地址family不支持 Address family not supported. */
|
||||
#define EAGAIN 6 /* 资源不可用，请重试。 Resource unavailable, try again (may be the same value as [EWOULDBLOCK]).*/
|
||||
#define EALREADY 7 /* 连接已经在处理 Connection already in progress. */
|
||||
#define EBADF 8 /* 错误的文件描述符 Bad file descriptor. */
|
||||
#define EBADMSG 9 /* 错误的消息 Bad message. */
|
||||
|
||||
#define EBUSY 10 /* 设备或资源忙 Device or resource busy. */
|
||||
#define ECANCELED 11 /* 操作被取消 Operation canceled. */
|
||||
#define ECHILD 12 /* 没有子进程 No child processes. */
|
||||
#define ECONNABORTED 13 /* 连接已断开 Connection aborted. */
|
||||
#define ECONNREFUSED 14 /* 连接被拒绝 Connection refused. */
|
||||
#define ECONNRESET 15 /* 连接被重置 Connection reset. */
|
||||
#define EDEADLK 16 /* 资源死锁将要发生 Resource deadlock would occur. */
|
||||
#define EDESTADDRREQ 17 /* 需要目标地址 Destination address required.*/
|
||||
#define EDOM 18 /* 数学参数超出作用域 Mathematics argument out of domain of function. */
|
||||
#define EDQUOT 19 /* 保留使用 Reserved */
|
||||
#define EBUSY 10 /* 设备或资源忙 Device or resource busy. */
|
||||
#define ECANCELED 11 /* 操作被取消 Operation canceled. */
|
||||
#define ECHILD 12 /* 没有子进程 No child processes. */
|
||||
#define ECONNABORTED 13 /* 连接已断开 Connection aborted. */
|
||||
#define ECONNREFUSED 14 /* 连接被拒绝 Connection refused. */
|
||||
#define ECONNRESET 15 /* 连接被重置 Connection reset. */
|
||||
#define EDEADLK 16 /* 资源死锁将要发生 Resource deadlock would occur. */
|
||||
#define EDESTADDRREQ 17 /* 需要目标地址 Destination address required.*/
|
||||
#define EDOM 18 /* 数学参数超出作用域 Mathematics argument out of domain of function. */
|
||||
#define EDQUOT 19 /* 保留使用 Reserved */
|
||||
|
||||
#define EEXIST 20 /* 文件已存在 File exists. */
|
||||
#define EFAULT 21 /* 错误的地址 Bad address */
|
||||
#define EFBIG 22 /* 文件太大 File too large. */
|
||||
#define EHOSTUNREACH 23 /* 主机不可达 Host is unreachable.*/
|
||||
#define EIDRM 24 /* 标志符被移除 Identifier removed. */
|
||||
#define EILSEQ 25 /* 不合法的字符序列 Illegal byte sequence. */
|
||||
#define EINPROGRESS 26 /* 操作正在处理 Operation in progress. */
|
||||
#define EINTR 27 /* 被中断的函数 Interrupted function. */
|
||||
#define EINVAL 28 /* 不可用的参数 Invalid argument. */
|
||||
#define EIO 29 /* I/O错误 I/O error. */
|
||||
#define EEXIST 20 /* 文件已存在 File exists. */
|
||||
#define EFAULT 21 /* 错误的地址 Bad address */
|
||||
#define EFBIG 22 /* 文件太大 File too large. */
|
||||
#define EHOSTUNREACH 23 /* 主机不可达 Host is unreachable.*/
|
||||
#define EIDRM 24 /* 标志符被移除 Identifier removed. */
|
||||
#define EILSEQ 25 /* 不合法的字符序列 Illegal byte sequence. */
|
||||
#define EINPROGRESS 26 /* 操作正在处理 Operation in progress. */
|
||||
#define EINTR 27 /* 被中断的函数 Interrupted function. */
|
||||
#define EINVAL 28 /* 不可用的参数 Invalid argument. */
|
||||
#define EIO 29 /* I/O错误 I/O error. */
|
||||
|
||||
#define EISCONN 30 /* 套接字已连接 Socket is connected. */
|
||||
#define EISDIR 31 /* 是一个目录 Is a directory */
|
||||
#define ELOOP 32 /* 符号链接级别过多 Too many levels of symbolic links. */
|
||||
#define EMFILE 33 /* 文件描述符的值过大 File descriptor value too large. */
|
||||
#define EMLINK 34 /* 链接数过多 Too many links. */
|
||||
#define EMSGSIZE 35 /* 消息过大 Message too large. */
|
||||
#define EMULTIHOP 36 /* 保留使用 Reserved. */
|
||||
#define ENAMETOOLONG 37 /* 文件名过长 Filename too long. */
|
||||
#define ENETDOWN 38 /* 网络已关闭 Network is down. */
|
||||
#define ENETRESET 39 /* 网络连接已断开 Connection aborted by network. */
|
||||
#define EISCONN 30 /* 套接字已连接 Socket is connected. */
|
||||
#define EISDIR 31 /* 是一个目录 Is a directory */
|
||||
#define ELOOP 32 /* 符号链接级别过多 Too many levels of symbolic links. */
|
||||
#define EMFILE 33 /* 文件描述符的值过大 File descriptor value too large. */
|
||||
#define EMLINK 34 /* 链接数过多 Too many links. */
|
||||
#define EMSGSIZE 35 /* 消息过大 Message too large. */
|
||||
#define EMULTIHOP 36 /* 保留使用 Reserved. */
|
||||
#define ENAMETOOLONG 37 /* 文件名过长 Filename too long. */
|
||||
#define ENETDOWN 38 /* 网络已关闭 Network is down. */
|
||||
#define ENETRESET 39 /* 网络连接已断开 Connection aborted by network. */
|
||||
|
||||
#define ENETUNREACH 40 /* 网络不可达 Network unreachable. */
|
||||
#define ENFILE 41 /* 系统中打开的文件过多 Too many files open in system.*/
|
||||
#define ENOBUFS 42 /* 缓冲区空间不足 No buffer space available. */
|
||||
#define ENODATA 43 /* 队列头没有可读取的消息 No message is available on the STREAM head read queue. */
|
||||
#define ENODEV 44 /* 没有指定的设备 No such device. */
|
||||
#define ENOENT 45 /* 没有指定的文件或目录 No such file or directory. */
|
||||
#define ENOEXEC 46 /* 可执行文件格式错误 Executable file format error. */
|
||||
#define ENOLCK 47 /* 没有可用的锁 No locks available. */
|
||||
#define ENOLINK 48 /* 保留 Reserved. */
|
||||
#define ENOMEM 49 /* 没有足够的空间 Not enough space. */
|
||||
#define ENETUNREACH 40 /* 网络不可达 Network unreachable. */
|
||||
#define ENFILE 41 /* 系统中打开的文件过多 Too many files open in system.*/
|
||||
#define ENOBUFS 42 /* 缓冲区空间不足 No buffer space available. */
|
||||
#define ENODATA 43 /* 队列头没有可读取的消息 No message is available on the STREAM head read queue. */
|
||||
#define ENODEV 44 /* 没有指定的设备 No such device. */
|
||||
#define ENOENT 45 /* 没有指定的文件或目录 No such file or directory. */
|
||||
#define ENOEXEC 46 /* 可执行文件格式错误 Executable file format error. */
|
||||
#define ENOLCK 47 /* 没有可用的锁 No locks available. */
|
||||
#define ENOLINK 48 /* 保留 Reserved. */
|
||||
#define ENOMEM 49 /* 没有足够的空间 Not enough space. */
|
||||
|
||||
#define ENOMSG 50 /* 没有期待类型的消息 No message of the desired type. */
|
||||
#define ENOPROTOOPT 51 /* 协议不可用 Protocol not available. */
|
||||
@ -77,35 +78,35 @@ extern "C" {
|
||||
#define ENOTCONN 56 /* 套接字未连接 The socket is not connected. */
|
||||
#define ENOTDIR 57 /* 不是目录 Not a directory. */
|
||||
#define ENOTEMPTY 58 /* 目录非空 Directory not empty. */
|
||||
#define ENOTRECOVERABLE 59 /* 状态不可覆盖 State not recoverable. */
|
||||
#define ENOTRECOVERABLE 59 /* 状态不可恢复 State not recoverable. */
|
||||
|
||||
#define ENOTSOCK 60 /* 不是一个套接字 Not a socket.*/
|
||||
#define ENOTSUP 61 /* 不被支持 Not supported (may be the same value as [EOPNOTSUPP]). */
|
||||
#define ENOTTY 62 /* 不正确的I/O控制操作 Inappropriate I/O control operation. */
|
||||
#define ENXIO 63 /* 没有这样的设备或地址 No such device or address. */
|
||||
#define EOPNOTSUPP 64 /* 套接字不支持该操作 Operation not supported on socket (may be the same value as [ENOTSUP]). */
|
||||
#define EOVERFLOW 65 /* 数值过大，产生溢出 Value too large to be stored in data type. */
|
||||
#define EOWNERDEAD 66 /* 之前的拥有者挂了 Previous owner died. */
|
||||
#define EPERM 67 /* 操作不被允许 Operation not permitted. */
|
||||
#define EPIPE 68 /* 断开的管道 Broken pipe. */
|
||||
#define EPROTO 69 /* 协议错误 Protocol error. */
|
||||
#define ENOTSOCK 60 /* 不是一个套接字 Not a socket.*/
|
||||
#define ENOTSUP 61 /* 不被支持 Not supported (may be the same value as [EOPNOTSUPP]). */
|
||||
#define ENOTTY 62 /* 不正确的I/O控制操作 Inappropriate I/O control operation. */
|
||||
#define ENXIO 63 /* 没有这样的设备或地址 No such device or address. */
|
||||
#define EOPNOTSUPP 64 /* 套接字不支持该操作 Operation not supported on socket (may be the same value as [ENOTSUP]). */
|
||||
#define EOVERFLOW 65 /* 数值过大，产生溢出 Value too large to be stored in data type. */
|
||||
#define EOWNERDEAD 66 /* 之前的拥有者挂了 Previous owner died. */
|
||||
#define EPERM 67 /* 操作不被允许 Operation not permitted. */
|
||||
#define EPIPE 68 /* 断开的管道 Broken pipe. */
|
||||
#define EPROTO 69 /* 协议错误 Protocol error. */
|
||||
|
||||
#define EPROTONOSUPPORT 70 /* 协议不被支持 Protocol not supported. */
|
||||
#define EPROTOTYPE 71 /* 对于套接字而言，错误的协议 Protocol wrong type for socket. */
|
||||
#define ERANGE 72 /* 结果过大 Result too large. */
|
||||
#define EROFS 73 /* 只读的文件系统 Read-only file system. */
|
||||
#define ESPIPE 74 /* 错误的寻道 Invalid seek. */
|
||||
#define ESPIPE 74 /* 错误的寻道.当前文件是pipe，不允许seek请求 Invalid seek. */
|
||||
#define ESRCH 75 /* 没有这样的进程 No such process. */
|
||||
#define ESTALE 76 /* 保留 Reserved. */
|
||||
#define ETIME 77 /* 流式ioctl()超时 Stream ioctl() timeout */
|
||||
#define ETIMEDOUT 78 /* 连接超时 Connection timed out.*/
|
||||
#define ETXTBSY 79 /* 文本文件忙 Text file busy. */
|
||||
|
||||
#define EWOULDBLOCK 80 /* 操作将被禁止 Operation would block (may be the same value as [EAGAIN]). */
|
||||
#define EXDEV 81 /* 跨设备连接 Cross-device link. */
|
||||
#define EWOULDBLOCK 80 /* 操作将被禁止 Operation would block (may be the same value as [EAGAIN]). */
|
||||
#define EXDEV 81 /* 跨设备连接 Cross-device link. */
|
||||
|
||||
extern int errno;
|
||||
extern int errno;
|
||||
|
||||
#if defined(__cplusplus)
|
||||
} /* extern "C" */
|
||||
#if defined(__cplusplus)
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
@ -12,27 +12,31 @@
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define O_RDONLY 00000000 // Open Read-only
|
||||
#define O_WRONLY 00000001 // Open Write-only
|
||||
#define O_RDWR 00000002 // Open read/write
|
||||
#endif
|
||||
#define O_RDONLY 00000000 // Open Read-only
|
||||
#define O_WRONLY 00000001 // Open Write-only
|
||||
#define O_RDWR 00000002 // Open read/write
|
||||
#define O_ACCMODE 00000003 // Mask for file access modes
|
||||
|
||||
#define O_CREAT 00000100 // Create file if it does not exist
|
||||
#define O_EXCL 00000200 // Fail if file already exists
|
||||
#define O_CREAT 00000100 // Create file if it does not exist
|
||||
#define O_EXCL 00000200 // Fail if file already exists
|
||||
#define O_NOCTTY 00000400 // Do not assign controlling terminal
|
||||
|
||||
#define O_TRUNC 00001000 // 文件存在且是普通文件，并以O_RDWR或O_WRONLY打开，则它会被清空
|
||||
|
||||
#define O_APPEND 00002000 // 文件指针会被移动到文件末尾
|
||||
#define O_APPEND 00002000 // 文件指针会被移动到文件末尾
|
||||
|
||||
#define O_NONBLOCK 00004000 // 非阻塞式IO模式
|
||||
|
||||
#define O_EXEC 00010000 // 以仅执行的方式打开（非目录文件）
|
||||
#define O_SEARCH 00020000 // Open the directory for search only
|
||||
#define O_DIRECTORY 00040000 // 打开的必须是一个目录
|
||||
#define O_NOFOLLOW 00100000 // Do not follow symbolic links
|
||||
#define O_DSYNC 00010000 // used to be O_SYNC, see below
|
||||
#define FASYNC 00020000 // fcntl, for BSD compatibility
|
||||
#define O_DIRECT 00040000 // direct disk access hint
|
||||
#define O_LARGEFILE 00100000
|
||||
#define O_DIRECTORY 00200000 // 打开的必须是一个目录
|
||||
#define O_NOFOLLOW 00400000 // Do not follow symbolic links
|
||||
#define O_NOATIME 01000000
|
||||
#define O_CLOEXEC 02000000 // set close_on_exec
|
||||
|
||||
/*
|
||||
* The constants AT_REMOVEDIR and AT_EACCESS have the same value. AT_EACCESS is
|
||||
|
||||
Reference in New Issue
Block a user