shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 18:27:04 +03:00
Code

Merge pull request #5942 from keszybz/timestamp-writing

Browse Source 
Allow timestamp to be set by the file writing utility functions
This commit is contained in:
Lennart Poettering 2017-05-12 12:00:24 +02:00 committed by GitHub
commit 2cfafe4d03
5 changed files with 38 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/basic/fileio-label.c
View File

@ -24,14 +24,14 @@
#include "fileio.h"
#include "selinux-util.h"
int write_string_file_atomic_label(const char *fn, const char *line) {
int write_string_file_atomic_label_ts(const char *fn, const char *line, struct timespec *ts) {
int r;
r = mac_selinux_create_file_prepare(fn, S_IFREG);
if (r < 0)
return r;
r = write_string_file(fn, line, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC);
r = write_string_file_ts(fn, line, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC, ts);
mac_selinux_create_file_clear();

5
src/basic/fileio-label.h
View File

@ -24,7 +24,10 @@
#include "fileio.h"
int write_string_file_atomic_label(const char *fn, const char *line);
int write_string_file_atomic_label_ts(const char *fn, const char *line, struct timespec *ts);
static inline int write_string_file_atomic_label(const char *fn, const char *line) {
return write_string_file_atomic_label_ts(fn, line, NULL);
}
int write_env_file_label(const char *fname, char **l);
int fopen_temporary_label(const char *target,
const char *path, FILE **f, char **temp_path);

16
src/basic/fileio.c
View File

@ -51,7 +51,7 @@
#define READ_FULL_BYTES_MAX (4U*1024U*1024U)
int write_string_stream(FILE *f, const char *line, bool enforce_newline) {
int write_string_stream_ts(FILE *f, const char *line, bool enforce_newline, struct timespec *ts) {
assert(f);
assert(line);
@ -60,6 +60,13 @@ int write_string_stream(FILE *f, const char *line, bool enforce_newline) {
if (enforce_newline && !endswith(line, "\n"))
fputc('\n', f);
if (ts) {
struct timespec twice[2] = {*ts, *ts};
if (futimens(fileno(f), twice) < 0)
return -errno;
}
return fflush_and_check(f);
}
@ -89,7 +96,7 @@ static int write_string_file_atomic(const char *fn, const char *line, bool enfor
return r;
}
int write_string_file(const char *fn, const char *line, WriteStringFileFlags flags) {
int write_string_file_ts(const char *fn, const char *line, WriteStringFileFlags flags, struct timespec *ts) {
_cleanup_fclose_ FILE *f = NULL;
int q, r;
@ -104,7 +111,8 @@ int write_string_file(const char *fn, const char *line, WriteStringFileFlags fla
goto fail;
return r;
}
} else
assert(ts == NULL);
if (flags & WRITE_STRING_FILE_CREATE) {
f = fopen(fn, "we");
@ -131,7 +139,7 @@ int write_string_file(const char *fn, const char *line, WriteStringFileFlags fla
}
}
r = write_string_stream(f, line, !(flags & WRITE_STRING_FILE_AVOID_NEWLINE));
r = write_string_stream_ts(f, line, !(flags & WRITE_STRING_FILE_AVOID_NEWLINE), ts);
if (r < 0)
goto fail;

10
src/basic/fileio.h
View File

@ -35,8 +35,14 @@ typedef enum {
WRITE_STRING_FILE_VERIFY_ON_FAILURE = 8,
} WriteStringFileFlags;
int write_string_stream(FILE *f, const char *line, bool enforce_newline);
int write_string_file(const char *fn, const char *line, WriteStringFileFlags flags);
int write_string_stream_ts(FILE *f, const char *line, bool enforce_newline, struct timespec *ts);
static inline int write_string_stream(FILE *f, const char *line, bool enforce_newline) {
return write_string_stream_ts(f, line, enforce_newline, NULL);
}
int write_string_file_ts(const char *fn, const char *line, WriteStringFileFlags flags, struct timespec *ts);
static inline int write_string_file(const char *fn, const char *line, WriteStringFileFlags flags) {
return write_string_file_ts(fn, line, flags, NULL);
}
int read_one_line_file(const char *fn, char **line);
int read_full_file(const char *fn, char **contents, size_t *size);

60
src/update-done/update-done.c
View File

@ -18,10 +18,7 @@
***/
#include "alloc-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
#include "io-util.h"
#include "fileio-label.h"
#include "selinux-util.h"
#include "util.h"
@ -31,64 +28,25 @@
"# was updated. See man:systemd-update-done.service(8).\n"
static int apply_timestamp(const char *path, struct timespec *ts) {
struct timespec twice[2] = {
*ts,
*ts
};
_cleanup_fclose_ FILE *f = NULL;
int fd = -1;
_cleanup_free_ char *message = NULL;
int r;
_cleanup_(unlink_and_freep) char *tmp = NULL;
assert(path);
assert(ts);
/*
* We store the timestamp both as mtime of the file and in the file itself,
* to support filesystems which cannot store nanosecond-precision timestamps.
* Hence, don't bother updating the file, let's just rewrite it.
*/
r = mac_selinux_create_file_prepare(path, S_IFREG);
if (r < 0)
return log_error_errno(r, "Failed to set SELinux context for %s: %m", path);
fd = open_tmpfile_linkable(path, O_WRONLY|O_CLOEXEC, &tmp);
mac_selinux_create_file_clear();
if (fd < 0) {
if (errno == EROFS)
return log_debug("Can't create temporary timestamp file %s, file system is read-only.", tmp);
return log_error_errno(errno, "Failed to create/open temporary timestamp file %s: %m", tmp);
}
f = fdopen(fd, "we");
if (!f) {
safe_close(fd);
return log_error_errno(errno, "Failed to fdopen() timestamp file %s: %m", tmp);
}
(void) fprintf(f,
if (asprintf(&message,
MESSAGE
"TIMESTAMP_NSEC=" NSEC_FMT "\n",
timespec_load_nsec(ts));
timespec_load_nsec(ts)) < 0)
return log_oom();
r = fflush_and_check(f);
r = write_string_file_atomic_label_ts(path, message, ts);
if (r == -EROFS)
return log_debug("Cannot create \"%s\", file system is read-only.", path);
if (r < 0)
return log_error_errno(r, "Failed to write timestamp file: %m");
if (futimens(fd, twice) < 0)
return log_error_errno(errno, "Failed to update timestamp on %s: %m", tmp);
/* fix permissions */
(void) fchmod(fd, 0644);
r = link_tmpfile(fd, tmp, path);
if (r < 0)
return log_error_errno(r, "Failed to move \"%s\" to \"%s\": %m", tmp, path);
tmp = mfree(tmp);
return log_error_errno(r, "Failed to write \"%s\": %m", path);
return 0;
}