diff options
| author | Marvin Borner | 2020-07-25 00:12:57 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-07-25 00:12:57 +0200 |
| commit | 16c5b566d04e6cbf63f871bd569d4636a9e90d62 (patch) | |
| tree | 3cc851f5608b33f7c0f690ef319e4aa5e6c2ebda /src/features/fs.c | |
| parent | e83d78eb48eaaeca83bb21a9da4f98904eed4671 (diff) | |
Added fs wrapper
Diffstat (limited to 'src/features/fs.c')
| -rw-r--r-- | src/features/fs.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/features/fs.c b/src/features/fs.c index d505e31..c8136a8 100644 --- a/src/features/fs.c +++ b/src/features/fs.c @@ -48,7 +48,7 @@ u32 read_indirect(u32 indirect, u32 block_num) return *(u32 *)((u32)data + block_num * 4); } -void *read_file(struct inode *in) +void *read_inode(struct inode *in) { //assert(in); if (!in) @@ -78,17 +78,22 @@ void *read_file(struct inode *in) if (i < 12) { blocknum = in->block[i]; data = buffer_read(blocknum); - memcpy((u32 *)((u32)buf + i * BLOCK_SIZE), data, BLOCK_SIZE); + memcpy((u8 *)((u32)buf + i * BLOCK_SIZE), data, BLOCK_SIZE); } else { blocknum = read_indirect(indirect, i - 12); data = buffer_read(blocknum); - memcpy((u32 *)((u32)buf + (i - 1) * BLOCK_SIZE), data, BLOCK_SIZE); + memcpy((u8 *)((u32)buf + (i - 1) * BLOCK_SIZE), data, BLOCK_SIZE); } } return buf; } +void *read_file(const char *name, int dir_inode) +{ + return read_inode(get_inode(find_inode(name, dir_inode))); +} + int find_inode(const char *name, int dir_inode) { if (!dir_inode) @@ -101,7 +106,7 @@ int find_inode(const char *name, int dir_inode) for (u32 q = 0; q < i->blocks / 2; q++) { char *data = buffer_read(i->block[q]); - memcpy((u32 *)((u32)buf + (q * BLOCK_SIZE)), data, BLOCK_SIZE); + memcpy((u32 *)((u32)buf + q * BLOCK_SIZE), data, BLOCK_SIZE); } struct dirent *d = (struct dirent *)buf; @@ -110,7 +115,6 @@ int find_inode(const char *name, int dir_inode) do { // Calculate the 4byte aligned size of each entry sum += d->total_len; - //printf("%2d %10s\t%2d %3d\n", (int)d->inode, d->name, d->name_len, d->rec_len); if (strncmp((void *)d->name, name, d->name_len) == 0) { free(buf); return d->inode_num; @@ -130,7 +134,7 @@ void ls_root() for (u32 q = 0; q < i->blocks / 2; q++) { char *data = buffer_read(i->block[q]); - memcpy((u32 *)((u32)buf + (q * BLOCK_SIZE)), data, BLOCK_SIZE); + memcpy((u32 *)((u32)buf + q * BLOCK_SIZE), data, BLOCK_SIZE); } struct dirent *d = (struct dirent *)buf; |