Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

storage: Add ability to preserve times 

We use the mtime on the network profile as the 'Last Connected Time'.
When we update any property and sync the file to disk, the mtime was not
preserved (since we were creating a new temporary file instead of
modifying the old one).  This led to LastConnectedTime property change
being emitted / updated incorrectly when a writable property on the
KnownNetwork interface was updated.
This commit is contained in:
Denis Kenzior 2020-01-22 11:15:19 -06:00
parent 759dbdd37f
commit 681172a999
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot.c
View File

@ -112,7 +112,7 @@ static void hotspot_network_sync(struct network_info *info,
super);
data = l_settings_to_data(settings, &length);
write_file(data, length, "%s", config->filename);
write_file(data, length, true, "%s", config->filename);
l_free(data);
}

18
src/storage.c
View File

@ -120,7 +120,7 @@ ssize_t read_file(void *buffer, size_t len, const char *path_fmt, ...)
* file with a temporary name and when closed, it is renamed to the
* specified name (@path_fmt+args).
*/
ssize_t write_file(const void *buffer, size_t len,
ssize_t write_file(const void *buffer, size_t len, bool preserve_times,
const char *path_fmt, ...)
{
va_list ap;
@ -150,6 +150,18 @@ ssize_t write_file(const void *buffer, size_t len,
goto error_write;
}
if (preserve_times) {
struct stat st;
if (stat(path, &st) == 0) {
struct timespec times[2];
times[0] = st.st_atim;
times[1] = st.st_mtim;
utimensat(0, tmp_path, times, 0);
}
}
/*
* Now that the file contents are written, rename to the real
* file name; this way we are uniquely sure that the whole
@ -372,7 +384,7 @@ void storage_network_sync(enum security type, const char *ssid,
path = storage_get_network_file_path(type, ssid);
data = l_settings_to_data(settings, &length);
write_file(data, length, "%s", path);
write_file(data, length, true, "%s", path);
l_free(data);
l_free(path);
}
@ -420,7 +432,7 @@ void storage_known_frequencies_sync(struct l_settings *known_freqs)
known_freq_file_path = storage_get_path("/%s", KNOWN_FREQ_FILENAME);
data = l_settings_to_data(known_freqs, &len);
write_file(data, len, "%s", known_freq_file_path);
write_file(data, len, false, "%s", known_freq_file_path);
l_free(data);
l_free(known_freq_file_path);

5
src/storage.h
View File

@ -28,8 +28,9 @@ enum security;
ssize_t read_file(void *buffer, size_t len, const char *path_fmt, ...)
__attribute__((format(printf, 3, 4)));
ssize_t write_file(const void *buffer, size_t len, const char *path_fmt, ...)
__attribute__((format(printf, 3, 4)));
ssize_t write_file(const void *buffer, size_t len, bool preserve_times,
const char *path_fmt, ...)
__attribute__((format(printf, 4, 5)));
bool storage_create_dirs(void);
void storage_cleanup_dirs(void);