Use Windows-specific renaming function #90
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On Windows, rename() fails if the new filename already exists. Use the Windows specific function MoveFileExA with the MOVEFILE_REPLACE_EXISTING flag set instead to do renames.
gilles-peskine-arm
requested changes
Apr 10, 2019
library/psa_its_file.c
Outdated
| @@ -209,7 +213,12 @@ psa_status_t psa_its_set( psa_storage_uid_t uid, | |||
| } | |||
| if( status == PSA_SUCCESS ) | |||
| { | |||
| #if defined(_WIN32) | |||
There was a problem hiding this comment.
Please avoid non-structural use of the preprocessor, with #ifdef around things that aren't a standalone C block. Here, I think the best solution would be to define a function-like macro rename_replace_existing( oldpath, newpath ) with a platform-dependent definition.
gilles-peskine-arm
added
bug
gilles-peskine-arm
requested changes
Apr 11, 2019
library/psa_its_file.c
Outdated
| @@ -58,6 +62,13 @@ | |||
| #define PSA_ITS_MAGIC_STRING "PSA\0ITS\0" | |||
| #define PSA_ITS_MAGIC_LENGTH 8 | |||
|
|
|||
| #if defined(_WIN32) | |||
| #define rename_replace_existing( oldpath, newpath ) \ | |||
| (!MoveFileExA( oldpath, newpath, MOVEFILE_REPLACE_EXISTING )) | |||
There was a problem hiding this comment.
Style:
Suggested change
| (!MoveFileExA( oldpath, newpath, MOVEFILE_REPLACE_EXISTING )) | |
| ( ! MoveFileExA( oldpath, newpath, MOVEFILE_REPLACE_EXISTING ) ) |
gilles-peskine-arm
approved these changes
Apr 11, 2019
gilles-peskine-arm
added
needs: review
k-stachowiak
approved these changes
Apr 12, 2019
Patater
removed
the
needs: review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On Windows, rename() fails if the new filename already exists.
Use the Windows specific function MoveFileExA with the
MOVEFILE_REPLACE_EXISTING flag set instead to do renames.