Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved handling for existing files

Browse Source
This commit is contained in:
d0k3 2016-05-26 21:08:35 +02:00
parent 32e0b20f07
commit d367c926f9
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/fs.c
View File

@ -295,6 +295,10 @@ bool PathCopyVirtual(const char* destdir, const char* orig) {
ShowPrompt(false, "Virtual file size mismatch:\n%s\n%s", origstr, deststr); ShowPrompt(false, "Virtual file size mismatch:\n%s\n%s", origstr, deststr);
return false; return false;
} }
if (strncmp(dest, orig, 256) == 0) { // destination == origin
ShowPrompt(false, "Origin equals destination:\n%s\n%s", origstr, deststr);
return false;
}
if ((dvfile.flags & VFLAG_A9LH_AREA) && // check A9LH critical area if ((dvfile.flags & VFLAG_A9LH_AREA) && // check A9LH critical area
!ShowPrompt(true, "This is critical for A9LH:\n%s\nProceed writing to it?", deststr)) !ShowPrompt(true, "This is critical for A9LH:\n%s\nProceed writing to it?", deststr))
return false; return false;
@ -377,11 +381,22 @@ bool PathCopyVirtual(const char* destdir, const char* orig) {
if (!FindVirtualFile(&ovfile, orig, 0)) if (!FindVirtualFile(&ovfile, orig, 0))
return false; return false;
// check if destination exists // check if destination exists
if (f_stat(dest, NULL) == FR_OK) { if (f_stat(dest, NULL) == FR_OK) {
if (!ShowPrompt(true, "Destination already exists:\n%s\nOverwrite existing file?", deststr)) const char* optionstr[3] = {"Choose new name", "Overwrite file", "Skip file"};
return false; u32 user_select = ShowSelectPrompt(3, optionstr, "Destination already exists:\n%s", deststr);
if (user_select == 1) {
do {
char* dname = strrchr(dest, '/');
if (dname == NULL) return false;
dname++;
if (!ShowInputPrompt(dname, 255 - (dname - dest), "Choose new destination name"))
return false;
} while (f_stat(dest, NULL) == FR_OK);
} else if (user_select != 2) return (user_select == 3);
} }
if (f_open(&dfile, dest, FA_WRITE | FA_CREATE_ALWAYS) != FR_OK) if (f_open(&dfile, dest, FA_WRITE | FA_CREATE_ALWAYS) != FR_OK)
return false; return false;
f_lseek(&dfile, 0); f_lseek(&dfile, 0);
@ -436,10 +451,11 @@ bool PathCopyWorker(char* dest, char* orig, bool overwrite, bool move) {
strncpy(dname, oname, 256 - (dname - dest)); strncpy(dname, oname, 256 - (dname - dest));
// check if destination is part of or equal origin // check if destination is part of or equal origin
if (strncmp(dest, orig, 255) == 0) { while (strncmp(dest, orig, 255) == 0) {
if (!ShowInputPrompt(dname, 255 - (dname - dest), "Destination is equal to origin\nChoose another name?")) if (!ShowInputPrompt(dname, 255 - (dname - dest), "Destination is equal to origin\nChoose another name?"))
return false; return false;
} else if (strncmp(dest, orig, strnlen(orig, 255)) == 0) { }
if (strncmp(dest, orig, strnlen(orig, 255)) == 0) {
if ((dest[strnlen(orig, 255)] == '/') || (dest[strnlen(orig, 255)] == '\0')) { if ((dest[strnlen(orig, 255)] == '/') || (dest[strnlen(orig, 255)] == '\0')) {
ShowPrompt(false, "Error: Destination is part of origin"); ShowPrompt(false, "Error: Destination is part of origin");
return false; return false;
@ -448,10 +464,16 @@ bool PathCopyWorker(char* dest, char* orig, bool overwrite, bool move) {
// check if destination exists // check if destination exists
if (!overwrite && (f_stat(dest, NULL) == FR_OK)) { if (!overwrite && (f_stat(dest, NULL) == FR_OK)) {
const char* optionstr[3] = {"Choose new name", "Overwrite file(s)", "Skip file(s)"};
char namestr[36 + 1]; char namestr[36 + 1];
TruncateString(namestr, dest, 36, 8); TruncateString(namestr, dest, 36, 8);
if (!ShowPrompt(true, "Destination already exists:\n%s\nOverwrite existing file(s)?", namestr)) u32 user_select = ShowSelectPrompt(3, optionstr, "Destination already exists:\n%s", namestr);
return false; if (user_select == 1) {
do {
if (!ShowInputPrompt(dname, 255 - (dname - dest), "Choose new destination name"))
return false;
} while (f_stat(dest, NULL) == FR_OK);
} else if (user_select != 2) return (user_select == 3);
overwrite = true; overwrite = true;
} }