Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-20 17:54:05 +01:00
Code Releases Activity

storage: use rename instead of unlink, link, unlink

Browse Source
This commit is contained in:
Denis Kenzior 2018-08-10 13:15:21 -05:00
parent e56656521d
commit 51c6d2d391
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/storage.c
View File

@ -27,6 +27,7 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -141,7 +142,6 @@ ssize_t write_file(const void *buffer, size_t len,
goto error_mkostemps; goto error_mkostemps;
r = TFR(write(fd, buffer, len)); r = TFR(write(fd, buffer, len));
TFR(close(fd)); TFR(close(fd));
if (r != (ssize_t) len) { if (r != (ssize_t) len) {
@ -153,15 +153,15 @@ ssize_t write_file(const void *buffer, size_t len,
* Now that the file contents are written, rename to the real * Now that the file contents are written, rename to the real
* file name; this way we are uniquely sure that the whole * file name; this way we are uniquely sure that the whole
* thing is there. * thing is there.
* conserve @r's value from 'write'
*/ */
unlink(path);
/* conserve @r's value from 'write' */ if (rename(tmp_path, path) == -1)
if (link(tmp_path, path) == -1)
r = -1; r = -1;
error_write: error_write:
unlink(tmp_path); if (r < 0)
unlink(tmp_path);
error_mkostemps: error_mkostemps:
error_create_dirs: error_create_dirs:
l_free(tmp_path); l_free(tmp_path);