rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't delete files/folders with read-only attribute

Browse Source
This commit is contained in:
RocketRobz 2020-02-03 19:45:24 -07:00
parent 925917cca0
commit a168b92948
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
arm9/source/file_browse.cpp
View File

@ -29,6 +29,7 @@
#include <dirent.h> #include <dirent.h>
#include <nds.h> #include <nds.h>
#include <fat.h>
#include "main.h" #include "main.h"
#include "date.h" #include "date.h"
@ -388,7 +389,9 @@ void recRemove(DirEntry* entry, std::vector<DirEntry> dirContents) {
for (int i = 1; i < ((int)dirContents.size()); i++) { for (int i = 1; i < ((int)dirContents.size()); i++) {
entry = &dirContents.at(i); entry = &dirContents.at(i);
if (entry->isDirectory) recRemove(entry, dirContents); if (entry->isDirectory) recRemove(entry, dirContents);
remove(entry->name.c_str()); if (!(FAT_getAttr(entry->name.c_str()) & ATTR_READONLY)) {
remove(entry->name.c_str());
}
} }
chdir (".."); chdir ("..");
remove(startEntry->name.c_str()); remove(startEntry->name.c_str());
@ -634,21 +637,35 @@ string browseForFile (void) {
swiWaitForVBlank(); swiWaitForVBlank();
if (pressed & KEY_A) { if (pressed & KEY_A) {
consoleClear(); consoleClear();
if (entry->isDirectory) { if (FAT_getAttr(entry->name.c_str()) & ATTR_READONLY) {
printf ("Deleting folder, please wait..."); printf ("Failed deleting:\n");
recRemove(entry, dirContents); printf (entry->name.c_str());
printf ("\n");
printf ("\n");
printf ("(<A> to continue)");
pressed = 0;
while (!(pressed & KEY_A)) {
scanKeys();
pressed = keysDown();
swiWaitForVBlank();
}
} else { } else {
printf ("Deleting file, please wait..."); if (entry->isDirectory) {
remove(entry->name.c_str()); printf ("Deleting folder, please wait...");
recRemove(entry, dirContents);
} else {
printf ("Deleting file, please wait...");
remove(entry->name.c_str());
}
char filePath[256];
snprintf(filePath, sizeof(filePath), "%s%s", path, entry->name.c_str());
if (strcmp(filePath, clipboard) == 0) {
clipboardUsed = false; // Disable clipboard restore
clipboardOn = false;
}
getDirectoryContents (dirContents);
fileOffset--;
} }
char filePath[256];
snprintf(filePath, sizeof(filePath), "%s%s", path, entry->name.c_str());
if (strcmp(filePath, clipboard) == 0) {
clipboardUsed = false; // Disable clipboard restore
clipboardOn = false;
}
getDirectoryContents (dirContents);
fileOffset--;
pressed = 0; pressed = 0;
break; break;
} }