diff options
author | Daniel Mack <daniel@zonque.org> | 2015-07-07 01:19:25 +0200 |
---|---|---|
committer | Daniel Mack <daniel@zonque.org> | 2015-07-07 01:19:25 +0200 |
commit | 4c1fc3e404d648c70bd2f50ac50aeac6ece8872e (patch) | |
tree | 977a223a8f5aa7fc2a5861a8d557b879bfc98a9f /src/binfmt | |
parent | fileio: add 'enforce_newline' argument to write_string_stream() (diff) | |
download | systemd-4c1fc3e404d648c70bd2f50ac50aeac6ece8872e.tar.xz systemd-4c1fc3e404d648c70bd2f50ac50aeac6ece8872e.zip |
fileio: consolidate write_string_file*()
Merge write_string_file(), write_string_file_no_create() and
write_string_file_atomic() into write_string_file() and provide a flags mask
that allows combinations of atomic writing, newline appending and automatic
file creation. Change all users accordingly.
Diffstat (limited to 'src/binfmt')
-rw-r--r-- | src/binfmt/binfmt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index 6028ed68c0..24eb410571 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -53,7 +53,7 @@ static int delete_rule(const char *rule) { if (!fn) return log_oom(); - return write_string_file(fn, "-1"); + return write_string_file(fn, "-1", 0); } static int apply_rule(const char *rule) { @@ -61,7 +61,7 @@ static int apply_rule(const char *rule) { delete_rule(rule); - r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule); + r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0); if (r < 0) return log_error_errno(r, "Failed to add binary format: %m"); @@ -191,7 +191,7 @@ int main(int argc, char *argv[]) { } /* Flush out all rules */ - write_string_file("/proc/sys/fs/binfmt_misc/status", "-1"); + write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_CREATE); STRV_FOREACH(f, files) { k = apply_file(*f, true); |