Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 05:48:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

<:N1:1130620612352679958><:N2:1130620354440745162>

Browse Source
This commit is contained in:
Willy-JL
2023-07-18 00:25:15 +01:00
parent bd9f2b6ff7
commit 23cee7197e
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -595,8 +595,11 @@ FS_Error storage_common_copy(Storage* storage, const char* old_path, const char*
static FS_Error _storage_common_merge(Storage*, const char*, const char*, bool); static FS_Error _storage_common_merge(Storage*, const char*, const char*, bool);
static FS_Error static FS_Error storage_merge_recursive(
storage_merge_recursive(Storage* storage, const char* old_path, const char* new_path, bool copy) { Storage* storage,
const char* old_path,
const char* new_path,
bool copy) {
FS_Error error = FSE_OK; FS_Error error = FSE_OK;
DirWalk* dir_walk = dir_walk_alloc(storage); DirWalk* dir_walk = dir_walk_alloc(storage);
FuriString *path, *file_basename, *tmp_new_path; FuriString *path, *file_basename, *tmp_new_path;
@@ -656,7 +659,8 @@ static FS_Error
return error; return error;
} }
static FS_Error _storage_common_merge(Storage* storage, const char* old_path, const char* new_path, bool copy) { static FS_Error
_storage_common_merge(Storage* storage, const char* old_path, const char* new_path, bool copy) {
FS_Error error; FS_Error error;
const char* new_path_tmp = NULL; const char* new_path_tmp = NULL;
FuriString* new_path_next = NULL; FuriString* new_path_next = NULL;
@@ -711,8 +715,10 @@ static FS_Error _storage_common_merge(Storage* storage, const char* old_path, co
Stream* stream_to = file_stream_alloc(storage); Stream* stream_to = file_stream_alloc(storage);
do { do {
if(!file_stream_open(stream_from, old_path, FSAM_READ, FSOM_OPEN_EXISTING)) break; if(!file_stream_open(stream_from, old_path, FSAM_READ, FSOM_OPEN_EXISTING))
if(!file_stream_open(stream_to, new_path_tmp, FSAM_WRITE, FSOM_CREATE_NEW)) break; break;
if(!file_stream_open(stream_to, new_path_tmp, FSAM_WRITE, FSOM_CREATE_NEW))
break;
stream_copy_full(stream_from, stream_to); stream_copy_full(stream_from, stream_to);
} while(false); } while(false);