fileio: add 'enforce_newline' argument to write_string_stream()

Add a flag to control whether write_string_stream() should always enforce a
trailing newline character in the file.

diff --git a/src/shared/fileio.c b/src/shared/fileio.c
index 00fb6f8b5cce1b6f75190bcb992383a7fdc563a8..82b40aa7daf93532dfb5d5d8f43b087d9ee66218 100644 (file)
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -27,14 +27,14 @@
 #include "ctype.h"
 #include "fileio.h"
 
 #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);
         assert(f);
         assert(line);
 
         errno = 0;
 
         fputs(line, f);

-        if (!endswith(line, "\n"))
+        if (enforce_newline && !endswith(line, "\n"))

                 fputc('\n', f);
 
         fflush(f);
                 fputc('\n', f);
 
         fflush(f);


@@ -55,7 +55,7 @@ int write_string_file(const char *fn, const char *line) {
         if (!f)
                 return -errno;
 
         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) {
 }
 
 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 -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) {
 }
 
 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);
 
 
         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;
         if (r >= 0) {
                 if (rename(p, fn) < 0)
                         r = -errno;

diff --git a/src/shared/fileio.h b/src/shared/fileio.h
index 91d4a0d2d5034ec9610435f8fc55c0773fdf4995..989b904c26ee580d52474032b7b3cac5d39e5341 100644 (file)
--- a/src/shared/fileio.h
+++ b/src/shared/fileio.h
@@ -25,7 +25,7 @@
 
 #include "macro.h"
 
 
 #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);
 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);