diff options
| author | Stef Walter <stef@thewalter.net> | 2013-07-17 15:53:33 +0200 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2013-07-18 06:53:11 +0200 |
| commit | 3f9da410144fd45ee6250dda28cae49300077e29 (patch) | |
| tree | c5ea2e0713907958ef1498e93f6547855ff11210 /trust/save.c | |
| parent | 82738fe7d6143cb25fc1cb201a75b8a071043be8 (diff) | |
| download | p11-kit-3f9da410144fd45ee6250dda28cae49300077e29.tar.gz | |
Fixes for some recent win32 regressions
Diffstat (limited to 'trust/save.c')
| -rw-r--r-- | trust/save.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/trust/save.c b/trust/save.c index acef483..0f047fc 100644 --- a/trust/save.c +++ b/trust/save.c @@ -282,20 +282,18 @@ p11_save_finish_file (p11_save_file *file, if (!path) ret = false; - } else { - if ((file->flags & P11_SAVE_OVERWRITE) && + } else if ((file->flags & P11_SAVE_OVERWRITE) && unlink (path) < 0 && errno != ENOENT) { - p11_message ("couldn't remove original file: %s: %s", - path, strerror (errno)); - ret = false; - } + p11_message ("couldn't remove original file: %s: %s", + path, strerror (errno)); + ret = false; + } - if (ret == true && - rename (file->temp, file->path) < 0) { - p11_message ("couldn't complete writing file: %s: %s", - file->path, strerror (errno)); - ret = false; - } + if (ret == true && + rename (file->temp, path) < 0) { + p11_message ("couldn't complete writing file: %s: %s", + path, strerror (errno)); + ret = false; } unlink (file->temp); |