Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-25 03:29:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix rename/move API, now rename/rename_safe (#468)

Browse Source 
On OFW "rename" acts like "move", it replaces the destination
XFW had an extra "move" like that, and "rename" errored if dest exists
Now for compatibility "rename" acts as OFW, and new "rename_safe" errors
Tweaked all usages to work properly
Decided for CLI and RPC to use "rename_safe" so user cant lose files
This commit is contained in:
Willy-JL
2023-11-28 00:00:40 +00:00
parent c4675afa5e
commit e0fa360640
9 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
applications/services/storage/storage_external_api.c
View File

@@ -479,12 +479,13 @@ FS_Error storage_common_rename(Storage* storage, const char* old_path, const cha
break;
}
if(storage_common_exists(storage, new_path)) {
error = FSE_EXIST;
break;
}
if(storage_dir_exists(storage, old_path)) {
// Cannot overwrite a file with a directory
if(storage_file_exists(storage, new_path)) {
error = FSE_INVALID_NAME;
break;
}
// Cannot rename a directory to itself or to a nested directory
if(storage_common_equivalent_path(storage, old_path, new_path, true)) {
error = FSE_INVALID_NAME;
@@ -497,6 +498,10 @@ FS_Error storage_common_rename(Storage* storage, const char* old_path, const cha
break;
}
if(storage_file_exists(storage, new_path)) {
storage_common_remove(storage, new_path);
}
S_API_PROLOGUE;
SAData data = {
.rename = {
@@ -525,7 +530,7 @@ FS_Error storage_common_rename(Storage* storage, const char* old_path, const cha
return error;
}
FS_Error storage_common_move(Storage* storage, const char* old_path, const char* new_path) {
FS_Error storage_common_rename_safe(Storage* storage, const char* old_path, const char* new_path) {
FS_Error error;
do {
@@ -534,30 +539,24 @@ FS_Error storage_common_move(Storage* storage, const char* old_path, const char*
break;
}
if(storage_dir_exists(storage, old_path)) {
// Cannot overwrite a file with a directory
if(storage_file_exists(storage, new_path)) {
error = FSE_INVALID_NAME;
break;
}
if(storage_common_exists(storage, new_path)) {
error = FSE_EXIST;
break;
}
// Cannot move a directory to itself or to a nested directory
if(storage_dir_exists(storage, old_path)) {
// Cannot rename a directory to itself or to a nested directory
if(storage_common_equivalent_path(storage, old_path, new_path, true)) {
error = FSE_INVALID_NAME;
break;
}
// Moving a regular file to itself does nothing and always succeeds
// Renaming a regular file to itself does nothing and always succeeds
} else if(storage_common_equivalent_path(storage, old_path, new_path, false)) {
error = FSE_OK;
break;
}
if(storage_common_exists(storage, new_path)) {
error = storage_simply_remove_recursive(storage, new_path);
if(error != FSE_OK) break;
}
S_API_PROLOGUE;
SAData data = {
.rename = {
@@ -756,7 +755,7 @@ static FS_Error
if(error == FSE_OK) {
if(file_info_is_dir(&fileinfo)) {
if(!copy) {
error = storage_common_rename(storage, old_path, new_path);
error = storage_common_rename_safe(storage, old_path, new_path);
}
if(copy || error != FSE_OK) {
error = storage_merge_recursive(storage, old_path, new_path, copy);
@@ -814,7 +813,7 @@ static FS_Error
stream_free(stream_from);
stream_free(stream_to);
} else {
error = storage_common_rename(storage, old_path, new_path_tmp);
error = storage_common_rename_safe(storage, old_path, new_path_tmp);
}
}
}