Trianta/fuse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stopped segfaults by moving casting a step out of a function

Browse Source
This commit is contained in:
TriantaTV 2022-11-26 23:56:41 -06:00
parent 1c237c1bcc
commit 565832e1ee
4 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fuse.h
View File

@ -47,9 +47,9 @@ typedef struct InodeStruct
typedef struct FileSystemStruct typedef struct FileSystemStruct
{ {
SuperBlockStruct* superBlock; SuperBlockStruct superBlock;
FBLStruct* fbl; FBLStruct fbl;
InodeStruct* inodes; InodeStruct inodes[DEFAULTINODEMAX];
} FileSystemStruct; } FileSystemStruct;
void Fuse(int argc, char* argv[]); void Fuse(int argc, char* argv[]);
@ -59,7 +59,7 @@ void FuseStructInit(fuseArgStruct* fuseStruct);
void FuseUsageError(char* programPath); void FuseUsageError(char* programPath);
int zerosize(int fd); int zerosize(int fd);
int FindEmptyBitPosition(int number); int FindEmptyBitPosition(int number);
ino_t GetFreeInodeNumber(int* fbl); ino_t GetFreeInodeNumber(int fbl[]);
void SetFileSystemDefaults(FileSystemStruct* fs); void SetFileSystemDefaults(FileSystemStruct* fs);
#endif #endif

4
include/fuseactions.h
View File

@ -7,8 +7,8 @@
extern unsigned char* tempfs; extern unsigned char* tempfs;
void MapFS(FileSystemStruct* fs, int fd); void MapFS(int fd);
void UnmapFS(FileSystemStruct* fs); void UnmapFS(void);
void FormatFS(FileSystemStruct* fs); void FormatFS(FileSystemStruct* fs);
void LoadFS(FileSystemStruct* fs); void LoadFS(FileSystemStruct* fs);
void ListFS(FileSystemStruct* fs); void ListFS(FileSystemStruct* fs);

21
src/fuse.c
View File

@ -75,10 +75,12 @@ void FuseGivenTest(fuseArgStruct* fuseArgs, char* programPath)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
MapFS(fsptr, fuseArgs->fd); MapFS(fuseArgs->fd);
if (fuseArgs->newfs) if (fuseArgs->newfs)
FormatFS(fsptr); FormatFS(fsptr);
LoadFS(fsptr); fsptr = (FileSystemStruct*) tempfs;
// LoadFS(fsptr);
printf("first free list:%i\n", fsptr->fbl.freeList[0]);
if (fuseArgs->add) if (fuseArgs->add)
AddFileToFS(fsptr, fuseArgs->toAdd); AddFileToFS(fsptr, fuseArgs->toAdd);
if (fuseArgs->remove) if (fuseArgs->remove)
@ -87,7 +89,7 @@ void FuseGivenTest(fuseArgStruct* fuseArgs, char* programPath)
ExtractFileFromFS(fsptr, fuseArgs->toExtract); ExtractFileFromFS(fsptr, fuseArgs->toExtract);
if(fuseArgs->list) if(fuseArgs->list)
ListFS(fsptr); ListFS(fsptr);
UnmapFS(fsptr); UnmapFS();
} }
// Initialize entire fuseStruct // Initialize entire fuseStruct
@ -134,7 +136,7 @@ int FindEmptyBitPosition(int number)
return -1; return -1;
} }
ino_t GetFreeInodeNumber(int* fbl) ino_t GetFreeInodeNumber(int fbl[])
{ {
int bitPosition; int bitPosition;
for (int i = 0; i < (DEFAULTINODEMAX/32); i++) for (int i = 0; i < (DEFAULTINODEMAX/32); i++)
@ -151,16 +153,15 @@ ino_t GetFreeInodeNumber(int* fbl)
void SetFileSystemDefaults(FileSystemStruct* fs) void SetFileSystemDefaults(FileSystemStruct* fs)
{ {
fs->superBlock->blockSize = DEFAULTBLOCKSIZE; fs->superBlock.blockSize = DEFAULTBLOCKSIZE;
fs->superBlock->blockCount = DEFAULTINODEMAX; fs->superBlock.blockCount = DEFAULTINODEMAX;
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
fs->fbl->freeList[i] = 0; fs->fbl.freeList[i] = 0;
printf("fdsfd%i\n", fs->fbl->freeList[0]);
for (int i = 0; i < DEFAULTINODEMAX; i++) for (int i = 0; i < DEFAULTINODEMAX; i++)
{ {
*fs->inodes[i].filePath = NULL; strcpy(fs->inodes[i].filePath, "\0");
fs->inodes[i].fileSize = 0; fs->inodes[i].fileSize = 0;
*fs->inodes[i].dataBlock.byte = NULL; strcpy(fs->inodes[i].dataBlock.byte, "\0");
} }
return; return;
} }

27
src/fuseactions.c
View File

@ -10,10 +10,10 @@
unsigned char* tempfs; unsigned char* tempfs;
void MapFS(FileSystemStruct* fs, int fd) void MapFS(int fd)
{ {
tempfs = mmap(NULL, FSSIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); tempfs = mmap(NULL, FSSIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (fs == NULL) if (tempfs == NULL)
{ {
perror("mmap failed"); perror("mmap failed");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -21,31 +21,34 @@ void MapFS(FileSystemStruct* fs, int fd)
return; return;
} }
void UnmapFS(FileSystemStruct* fs) void UnmapFS(void)
{ {
munmap(fs, FSSIZE); munmap(tempfs, FSSIZE);
return; return;
} }
void FormatFS(FileSystemStruct* fs) void FormatFS(FileSystemStruct* fs)
{ {
fs->superBlock = (SuperBlockStruct*) tempfs; SetFileSystemDefaults(tempfs);
fs->fbl = (FBLStruct*) (tempfs + sizeof(SuperBlockStruct)); // fs->superBlock = (FileSystemStruct*) tempfs->superBlock;
fs->inodes = (InodeStruct*) (tempfs + sizeof(SuperBlockStruct) + sizeof(FBLStruct)); // fs->fbl = (FileSystemStruct*) tempfs->fbl;
SetFileSystemDefaults(fs); // fs->inodes = (FileSystemStruct*) tempfs->inodes;
// for (int i = 0; i < DEFAULTINODEMAX; i++)
// fs->inodes[i] = *(InodeStruct*) (tempfs + sizeof(SuperBlockStruct) + sizeof(FBLStruct) + sizeof(InodeStruct) * i);
return; return;
} }
void LoadFS(FileSystemStruct* fs) void LoadFS(FileSystemStruct* fs)
{ {
fs = (FileSystemStruct*) tempfs;
return;
} }
void ListFS(FileSystemStruct* fs) void ListFS(FileSystemStruct* fs)
{ {
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
for (int j = 0; j < 32; j++) for (int j = 0; j < 32; j++)
if ((fs->fbl->freeList[i] & (1 << j)) == (1 << j)) if ((fs->fbl.freeList[i] & (1 << j)) == (1 << j))
printf("%s\n", fs->inodes[i*32 + j].filePath); printf("%s\n", fs->inodes[i*32 + j].filePath);
return; return;
} }
@ -53,7 +56,9 @@ void ListFS(FileSystemStruct* fs)
void AddFileToFS(FileSystemStruct* fs, char* fname) void AddFileToFS(FileSystemStruct* fs, char* fname)
{ {
struct stat statBuffer; struct stat statBuffer;
ino_t inodeNumber = GetFreeInodeNumber(fs->fbl->freeList); printf("Check\n");
printf("Bit: %i\n", fs->fbl.freeList[0]);
ino_t inodeNumber = GetFreeInodeNumber(fs->fbl.freeList);
strcpy(fs->inodes[inodeNumber].filePath, fname); strcpy(fs->inodes[inodeNumber].filePath, fname);
stat(fname, &statBuffer); stat(fname, &statBuffer);
fs->inodes[inodeNumber].fileSize = statBuffer.st_size; fs->inodes[inodeNumber].fileSize = statBuffer.st_size;