better handling of custom disk folders string

This commit is contained in:
Linus Dierheimer
2021-04-24 16:29:05 +02:00
parent ad122e9569
commit 36a4d095ed
+12 -1
View File
@@ -89,7 +89,7 @@ void ffPrintDisk(FFinstance* instance)
if(rootRet != 0 && homeRet != 0)
{
FF_STRBUF_CREATE(key);
getKey(instance, &key, "/", false);
getKey(instance, &key, "", false);
ffPrintError(instance, key.chars, 0, NULL, &instance->config.diskFormat, FF_DISK_NUM_FORMAT_ARGS, "statvfs failed for both / and /home");
ffStrbufDestroy(&key);
return;
@@ -103,6 +103,17 @@ void ffPrintDisk(FFinstance* instance)
}
else
{
ffStrbufTrim(&instance->config.diskFolders, ':');
if(instance->config.diskFolders.length == 0)
{
FF_STRBUF_CREATE(key);
getKey(instance, &key, "", false);
ffPrintError(instance, key.chars, 0, NULL, &instance->config.diskFormat, FF_DISK_NUM_FORMAT_ARGS, "Custom disk folders string doesn't contain any folders");
ffStrbufDestroy(&key);
return;
}
uint32_t lastIndex = 0;
while (lastIndex < instance->config.diskFolders.length)
{