CE add mkdir command, implement create_dir () syscall
All checks were successful
Build documentation / build-and-deploy (push) Successful in 2m1s
All checks were successful
Build documentation / build-and-deploy (push) Successful in 2m1s
This commit is contained in:
@@ -259,3 +259,10 @@ int fatfs_create_file (struct vfs_volume* volume, const char* path) {
|
||||
fl_fclose (fatfs_ctx, file);
|
||||
return ST_OK;
|
||||
}
|
||||
|
||||
int fatfs_create_dir (struct vfs_volume* volume, const char* path) {
|
||||
struct fatfs_ctx* fatfs_ctx = volume->udata;
|
||||
|
||||
int r = fl_createdirectory (fatfs_ctx, path);
|
||||
return r == 0 ? ST_OK : ST_CREATE_DIR_ERROR;
|
||||
}
|
||||
|
||||
@@ -29,4 +29,6 @@ int fatfs_read_dir_entry (struct vfs_volume* volume, const char* path, struct di
|
||||
|
||||
int fatfs_create_file (struct vfs_volume* volume, const char* path);
|
||||
|
||||
int fatfs_create_dir (struct vfs_volume* volume, const char* path);
|
||||
|
||||
#endif // _KERNEL_FS_FATFS_H
|
||||
|
||||
@@ -208,3 +208,8 @@ int tarfs_create_file (struct vfs_volume* volume, const char* path) {
|
||||
(void)volume, (void)path;
|
||||
return ST_OK;
|
||||
}
|
||||
|
||||
int tarfs_create_dir (struct vfs_volume* volume, const char* path) {
|
||||
(void)volume, (void)path;
|
||||
return ST_OK;
|
||||
}
|
||||
|
||||
@@ -51,4 +51,6 @@ int tarfs_read_dir_entry (struct vfs_volume* volume, const char* path, struct di
|
||||
|
||||
int tarfs_create_file (struct vfs_volume* volume, const char* path);
|
||||
|
||||
int tarfs_create_dir (struct vfs_volume* volume, const char* path);
|
||||
|
||||
#endif // _KERNEL_FS_TARFS_H
|
||||
|
||||
@@ -61,6 +61,7 @@ int vfs_create_volume (const char* key, int fs_type, struct device* back_device,
|
||||
volume->driver_ops.write_file = &tarfs_write_file;
|
||||
volume->driver_ops.read_dir_entry = &tarfs_read_dir_entry;
|
||||
volume->driver_ops.create_file = &tarfs_create_file;
|
||||
volume->driver_ops.create_dir = &tarfs_create_dir;
|
||||
break;
|
||||
case VFS_FAT16:
|
||||
volume->driver_ops.mount = &fatfs_mount;
|
||||
@@ -70,6 +71,7 @@ int vfs_create_volume (const char* key, int fs_type, struct device* back_device,
|
||||
volume->driver_ops.write_file = &fatfs_write_file;
|
||||
volume->driver_ops.read_dir_entry = &fatfs_read_dir_entry;
|
||||
volume->driver_ops.create_file = &fatfs_create_file;
|
||||
volume->driver_ops.create_dir = &fatfs_create_dir;
|
||||
break;
|
||||
case VFS_FAT32:
|
||||
volume->driver_ops.mount = &fatfs_mount;
|
||||
@@ -79,6 +81,7 @@ int vfs_create_volume (const char* key, int fs_type, struct device* back_device,
|
||||
volume->driver_ops.write_file = &fatfs_write_file;
|
||||
volume->driver_ops.read_dir_entry = &fatfs_read_dir_entry;
|
||||
volume->driver_ops.create_file = &fatfs_create_file;
|
||||
volume->driver_ops.create_dir = &fatfs_create_dir;
|
||||
break;
|
||||
default:
|
||||
free (volume);
|
||||
@@ -279,6 +282,24 @@ int vfs_read_dir_entry (struct proc* proc, const char* volume_name, const char*
|
||||
return volume->driver_ops.read_dir_entry (volume, path, entry, entry_num);
|
||||
}
|
||||
|
||||
int vfs_create_dir (struct proc* proc, const char* volume_name, const char* path) {
|
||||
struct vfs_volume* volume = vfs_find_volume (volume_name);
|
||||
|
||||
if (volume == NULL)
|
||||
return -ST_NOT_FOUND;
|
||||
|
||||
spin_lock (&volume->lock);
|
||||
|
||||
if (volume->locked && volume->owner != proc) {
|
||||
spin_unlock (&volume->lock);
|
||||
return -ST_PERMISSION_ERROR;
|
||||
}
|
||||
|
||||
spin_unlock (&volume->lock);
|
||||
|
||||
return volume->driver_ops.create_dir (volume, path);
|
||||
}
|
||||
|
||||
void vfs_init (void) {
|
||||
memset (&volume_table, 0, sizeof (volume_table));
|
||||
|
||||
|
||||
@@ -48,6 +48,8 @@ struct vfs_volume {
|
||||
size_t entry_num);
|
||||
|
||||
int (*create_file) (struct vfs_volume* volume, const char* path);
|
||||
|
||||
int (*create_dir) (struct vfs_volume* volume, const char* path);
|
||||
} driver_ops;
|
||||
struct device* back_device;
|
||||
void* udata
|
||||
@@ -79,6 +81,8 @@ int vfs_read_dir_entry (struct proc* proc, const char* volume, const char* path,
|
||||
|
||||
int vfs_create_file (struct proc* proc, const char* volume_name, const char* path);
|
||||
|
||||
int vfs_create_dir (struct proc* proc, const char* volume_name, const char* path);
|
||||
|
||||
void vfs_init (void);
|
||||
|
||||
void vfs_translate (size_t fs_block, size_t fs_block_count, size_t fs_block_size,
|
||||
|
||||
@@ -593,6 +593,30 @@ DEFINE_SYSCALL (sys_kill) {
|
||||
return ST_OK;
|
||||
}
|
||||
|
||||
/* int create_dir (char* path) */
|
||||
DEFINE_SYSCALL (sys_create_dir) {
|
||||
uintptr_t uvaddr_path = a1;
|
||||
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&proc->procgroup->lock);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
const char* path = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
spin_lock (&proc->lock);
|
||||
int ret = vfs_create_dir (proc, proc->cwv, path);
|
||||
spin_unlock (&proc->lock);
|
||||
|
||||
return SYSRESULT (ret);
|
||||
}
|
||||
|
||||
static syscall_handler_func_t handler_table[] = {
|
||||
[SYS_QUIT] = &sys_quit,
|
||||
[SYS_TEST] = &sys_test,
|
||||
@@ -620,6 +644,7 @@ static syscall_handler_func_t handler_table[] = {
|
||||
[SYS_WRITE_FILE] = &sys_write_file,
|
||||
[SYS_WAIT_FOR_PID] = &sys_wait_for_pid,
|
||||
[SYS_KILL] = &sys_kill,
|
||||
[SYS_CREATE_DIR] = &sys_create_dir,
|
||||
};
|
||||
|
||||
syscall_handler_func_t syscall_find_handler (int syscall_num) {
|
||||
|
||||
Reference in New Issue
Block a user