nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-19 22:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix FindDevice and RemoveDevice calls in fs_dev.c

Browse source
This commit is contained in:
TuxSH 2018-05-09 11:36:49 +02:00
parent 173e6c8c0f
commit 7560abbfbd
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
fusee/fusee-secondary/src/fs_dev.c
View file

@ -82,6 +82,8 @@ int fsdev_mount_device(const char *name, unsigned int id) {
fsdev_fsdevice_t *device = &g_devices[id]; fsdev_fsdevice_t *device = &g_devices[id];
FRESULT rc; FRESULT rc;
char drname[40]; char drname[40];
strcpy(drname, name);
strcat(drname, ":");
if (id >= FF_VOLUMES) { if (id >= FF_VOLUMES) {
errno = EINVAL; errno = EINVAL;
@ -91,7 +93,7 @@ int fsdev_mount_device(const char *name, unsigned int id) {
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
return -1; return -1;
} }
if (FindDevice(name) != -1 || g_devices[id].setup) { if (FindDevice(drname) != -1 || g_devices[id].setup) {
errno = EEXIST; /* Device already exists */ errno = EEXIST; /* Device already exists */
return -1; return -1;
} }
@ -103,9 +105,6 @@ int fsdev_mount_device(const char *name, unsigned int id) {
device->devoptab.deviceData = device; device->devoptab.deviceData = device;
VolumeStr[id] = device->name; VolumeStr[id] = device->name;
strcpy(drname, name);
strcat(drname, ":");
rc = f_mount(&device->fatfs, drname, 1); rc = f_mount(&device->fatfs, drname, 1);
if (rc != FR_OK) { if (rc != FR_OK) {
@ -125,7 +124,12 @@ int fsdev_mount_device(const char *name, unsigned int id) {
int fsdev_set_default_device(const char *name) { int fsdev_set_default_device(const char *name) {
int ret = 0; int ret = 0;
int devid = FindDevice(name); int devid;
char drname[40];
strcpy(drname, name);
strcat(drname, ":");
devid = FindDevice(drname);
if (devid == -1) { if (devid == -1) {
errno = ENOENT; errno = ENOENT;
@ -133,11 +137,6 @@ int fsdev_set_default_device(const char *name) {
} }
#if FF_VOLUMES >= 2 #if FF_VOLUMES >= 2
char drname[40];
strcpy(drname, name);
strcat(drname, ":");
ret = fsdev_convert_rc(NULL, f_chdrive(drname)); ret = fsdev_convert_rc(NULL, f_chdrive(drname));
#endif #endif
if (ret == 0) { if (ret == 0) {
@ -150,20 +149,23 @@ int fsdev_set_default_device(const char *name) {
int fsdev_unmount_device(const char *name) { int fsdev_unmount_device(const char *name) {
int ret; int ret;
char drname[40]; char drname[40];
int devid = FindDevice(name); int devid;
strcpy(drname, name);
strcat(drname, ":");
devid = FindDevice(drname);
if (devid == -1) { if (devid == -1) {
errno = ENOENT; errno = ENOENT;
return -1; return -1;
} }
strcpy(drname, name);
strcat(drname, ":");
ret = fsdev_convert_rc(NULL, f_unmount(drname)); ret = fsdev_convert_rc(NULL, f_unmount(drname));
if (ret == 0) { if (ret == 0) {
fsdev_fsdevice_t *device = (fsdev_fsdevice_t *)(GetDeviceOpTab(name)->deviceData); fsdev_fsdevice_t *device = (fsdev_fsdevice_t *)(GetDeviceOpTab(name)->deviceData);
RemoveDevice(name); RemoveDevice(drname);
memset(device, 0, sizeof(fsdev_fsdevice_t)); memset(device, 0, sizeof(fsdev_fsdevice_t));
} }