mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-29 05:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

vfs and tmpfs read

Browse Source
This commit is contained in:
Matheus
2022-08-07 13:13:42 -03:00
parent 1a2486cadd
commit bdc19f90ef
3 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fs/tmpfs.c
+14 -1
View File
@@ -53,6 +53,19 @@ static int tmpfs_write(int* error, vnode_t* node, void* buff, size_t count, size
return count;
}
static int tmpfs_read(int *error, vnode_t* node, void* buff, size_t count, size_t offset){
size_t sizemax = node->st.st_size - offset;
if(count > sizemax)
count = sizemax;
memcpy(buff, node->fsdata, count);
return count;
}
static int tmpfs_unmount(fs_t* fs) UNIMPLEMENTED
static int tmpfs_open(dirnode_t* parent, char* name) UNIMPLEMENTED
static int tmpfs_close(vnode_t* node) UNIMPLEMENTED
@@ -110,7 +123,7 @@ static int tmpfs_create(dirnode_t* parent, char* name, mode_t mode){
}
static fscalls_t funcs = {
tmpfs_mount, tmpfs_unmount, tmpfs_open, tmpfs_close, tmpfs_mkdir, tmpfs_create, tmpfs_write
tmpfs_mount, tmpfs_unmount, tmpfs_open, tmpfs_close, tmpfs_mkdir, tmpfs_create, tmpfs_write, tmpfs_read
};
src/fs/vfs.c
+29 -5
View File
@@ -60,11 +60,15 @@ int vfs_write(int* error, vnode_t* node, void* buff, size_t count, size_t offset
int type = GETTYPE(node->st.st_mode);
if(type == TYPE_DIR || type == TYPE_LINK)
return EINVAL;
if(type == TYPE_BLOCKDEV || type == TYPE_CHARDEV)
return ENOSYS; // TODO change this when the device manager is implemented :)
if(type == TYPE_DIR || type == TYPE_LINK){
*error = EINVAL;
return -1;
}
if(type == TYPE_BLOCKDEV || type == TYPE_CHARDEV){
*error = ENOSYS;
return -1; // TODO change this when the device manager is implemented :)
}
int writecount = node->fs->calls->write(error, node, buff, count, offset);
@@ -72,6 +76,26 @@ int vfs_write(int* error, vnode_t* node, void* buff, size_t count, size_t offset
}
int vfs_read(int* error, vnode_t* node, void* buff, size_t count, size_t offset){
int type = GETTYPE(node->st.st_mode);
if(type == TYPE_DIR || type == TYPE_LINK){
*error = EINVAL;
return -1;
}
if(type == TYPE_BLOCKDEV || type == TYPE_CHARDEV){
*error = ENOSYS;
return -1; // TODO change this when the device manager is implemented :)
}
int readcount = node->fs->calls->read(error, node, buff, count, offset);
return readcount;
}
int vfs_close(vnode_t* node){
vfs_releasenode(node);