WallyHackenslacker/lovedos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved filesystem errors

Browse Source
This commit is contained in:
rxi
2016-10-01 13:50:26 +01:00
parent 626a778510
commit 82d7561265
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/filesystem.c
View File

@@ -69,7 +69,7 @@ static int concat_path(char *dst, const char *dir, const char *filename) {
/* Fail if the resultant path would overflow buffer */ /* Fail if the resultant path would overflow buffer */
if (dirlen + filenamelen + 2 > MAX_PATH) { if (dirlen + filenamelen + 2 > MAX_PATH) {
return FILESYSTEM_EFAILURE; return FILESYSTEM_ETOOLONG;
} }
/* Write full name to buffer and return ok */ /* Write full name to buffer and return ok */
@@ -387,8 +387,12 @@ fail:
const char* filesystem_strerror(int err) { const char* filesystem_strerror(int err) {
switch (err) { switch (err) {
case FILESYSTEM_ESUCCESS: return "success"; case FILESYSTEM_ESUCCESS : return "success";
case FILESYSTEM_EFAILURE: return "failure"; case FILESYSTEM_EFAILURE : return "failure";
case FILESYSTEM_ETOOLONG : return "path too long";
case FILESYSTEM_EMOUNTED : return "path already mounted";
case FILESYSTEM_ENOMOUNT : return "path is not mounted";
case FILESYSTEM_EMOUNTFAIL : return "could not mount path";
} }
return "unknown error"; return "unknown error";
} }
@@ -405,12 +409,12 @@ void filesystem_deinit(void) {
int filesystem_mount(const char *path) { int filesystem_mount(const char *path) {
/* Check path length is ok */ /* Check path length is ok */
if ( strlen(path) >= MAX_PATH ) { if ( strlen(path) >= MAX_PATH ) {
return FILESYSTEM_EFAILURE; return FILESYSTEM_ETOOLONG;
} }
/* Check path isn't already mounted */ /* Check path isn't already mounted */
FOREACH_MOUNT(m) { FOREACH_MOUNT(m) {
if ( !strcmp(m->path, path) ) { if ( !strcmp(m->path, path) ) {
return FILESYSTEM_EFAILURE; return FILESYSTEM_EMOUNTED;
} }
} }
@@ -429,7 +433,7 @@ int filesystem_mount(const char *path) {
/* Fail */ /* Fail */
filesystem_mountIdx--; filesystem_mountIdx--;
return FILESYSTEM_EFAILURE; return FILESYSTEM_EMOUNTFAIL;
success: success:
return FILESYSTEM_ESUCCESS; return FILESYSTEM_ESUCCESS;
@@ -448,7 +452,7 @@ int filesystem_unmount(const char *path) {
return FILESYSTEM_ESUCCESS; return FILESYSTEM_ESUCCESS;
} }
} }
return FILESYSTEM_EFAILURE; return FILESYSTEM_ENOMOUNT;
} }

8
src/filesystem.h
View File

@@ -13,8 +13,12 @@
#include <stddef.h> #include <stddef.h>
enum { enum {
FILESYSTEM_ESUCCESS = 0, FILESYSTEM_ESUCCESS = 0,
FILESYSTEM_EFAILURE = -1, FILESYSTEM_EFAILURE = -1,
FILESYSTEM_ETOOLONG = -2,
FILESYSTEM_EMOUNTED = -3,
FILESYSTEM_ENOMOUNT = -4,
FILESYSTEM_EMOUNTFAIL = -5
}; };
const char* filesystem_strerror(int err); const char* filesystem_strerror(int err);