eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minimig: Fix path resolution for assigns

Browse Source 
Only nullify the key in find_path() if the name contains our device
(SHARE:) or volume (MiSTer:) name.

This fixes the ability to create assigns to locations on the shared
filesystem. If find_path() is called with an assign-relative path, we
want to preserve the key so that a relative path is constructed from the
directory associated with that key.
This commit is contained in:
Dale Whinham
2020-12-13 00:42:21 +00:00
parent bc6e69c26b
commit d48169169e
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
support/minimig/minimig_share.cpp
View File

@@ -27,6 +27,10 @@ static uint8_t *shmem = 0;
#define REQUEST_BUFFER 4 // ~512B
#define DATA_BUFFER 0x1000 // 4KB
// Must match device name in MountList and volume name from MiSTerFileSystem
#define DEVICE_NAME "SHARE"
#define VOLUME_NAME "MiSTer"
//#define DEBUG
#ifdef DEBUG
@@ -124,7 +128,12 @@ static char* find_path(uint32_t key, const char *name)
const char* p = strchr(name, ':');
if (p)
{
key = 0;
size_t root_len = p - name;
// Don't use lock for relative path if the name contains our root
if (root_len == 0 || !strncasecmp(name, DEVICE_NAME, root_len) || !strncasecmp(name, VOLUME_NAME, root_len))
key = 0;
name = p + 1;
}