AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use function-like macro for Windows renaming

Browse Source
This commit is contained in:
Darryl Green 2019-04-11 12:54:02 +01:00
parent b467934fb7
commit fdda7de048
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/psa_its_file.c
View File

@ -62,6 +62,13 @@
#define PSA_ITS_MAGIC_STRING "PSA\0ITS\0" #define PSA_ITS_MAGIC_STRING "PSA\0ITS\0"
#define PSA_ITS_MAGIC_LENGTH 8 #define PSA_ITS_MAGIC_LENGTH 8
#if defined(_WIN32)
#define rename_replace_existing( oldpath, newpath ) \
(!MoveFileExA( oldpath, newpath, MOVEFILE_REPLACE_EXISTING ))
#else
#define rename_replace_existing( oldpath, newpath ) rename( oldpath, newpath )
#endif
typedef struct typedef struct
{ {
uint8_t magic[PSA_ITS_MAGIC_LENGTH]; uint8_t magic[PSA_ITS_MAGIC_LENGTH];
@ -213,12 +220,7 @@ exit:
} }
if( status == PSA_SUCCESS ) if( status == PSA_SUCCESS )
{ {
#if defined(_WIN32) if( rename_replace_existing( PSA_ITS_STORAGE_TEMP, filename ) != 0 )
if( MoveFileExA( PSA_ITS_STORAGE_TEMP, filename,
MOVEFILE_REPLACE_EXISTING ) == 0 )
#else
if( rename( PSA_ITS_STORAGE_TEMP, filename ) != 0 )
#endif
status = PSA_ERROR_STORAGE_FAILURE; status = PSA_ERROR_STORAGE_FAILURE;
} }
remove( PSA_ITS_STORAGE_TEMP ); remove( PSA_ITS_STORAGE_TEMP );