SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fileio: add 'enforce_newline' argument to write_string_stream()

Browse Source 
Add a flag to control whether write_string_stream() should always enforce a
trailing newline character in the file.
This commit is contained in:
Daniel Mack
2015-07-06 17:31:44 -04:00
parent eff8efe671
commit 40beecdb6d
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/fileio.c
+5 -5
View File
@@ -27,14 +27,14 @@
#include "ctype.h"
#include "fileio.h"
int write_string_stream(FILE *f, const char *line) {
int write_string_stream(FILE *f, const char *line, bool enforce_newline) {
assert(f);
assert(line);
errno = 0;
fputs(line, f);
if (!endswith(line, "\n"))
if (enforce_newline && !endswith(line, "\n"))
fputc('\n', f);
fflush(f);
@@ -55,7 +55,7 @@ int write_string_file(const char *fn, const char *line) {
if (!f)
return -errno;
return write_string_stream(f, line);
return write_string_stream(f, line, true);
}
int write_string_file_no_create(const char *fn, const char *line) {
@@ -77,7 +77,7 @@ int write_string_file_no_create(const char *fn, const char *line) {
return -errno;
}
return write_string_stream(f, line);
return write_string_stream(f, line, true);
}
int write_string_file_atomic(const char *fn, const char *line) {
@@ -94,7 +94,7 @@ int write_string_file_atomic(const char *fn, const char *line) {
fchmod_umask(fileno(f), 0644);
r = write_string_stream(f, line);
r = write_string_stream(f, line, true);
if (r >= 0) {
if (rename(p, fn) < 0)
r = -errno;
src/basic/fileio.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include "macro.h"
int write_string_stream(FILE *f, const char *line);
int write_string_stream(FILE *f, const char *line, bool enforce_newline);
int write_string_file(const char *fn, const char *line);
int write_string_file_no_create(const char *fn, const char *line);
int write_string_file_atomic(const char *fn, const char *line);