X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fshared%2Ffileio.h;h=2e8148ff2424563bcfc60856a7591bde502601d8;hb=b733fbe7a0214eb43e402db7179697bf9c0975c1;hp=06c28871575ce5707addb916d12f573258dd9b60;hpb=e93c33d4aadb41427f215d43545e7fadc6bcec6f;p=elogind.git

diff --git a/src/shared/fileio.h b/src/shared/fileio.h
index 06c288715..2e8148ff2 100644
--- a/src/shared/fileio.h
+++ b/src/shared/fileio.h
@@ -25,16 +25,25 @@
 
 #include "macro.h"
 
-int write_string_to_file(FILE *f, const char *line);
-int write_string_file(const char *fn, const char *line);
-int write_string_file_atomic(const char *fn, const char *line);
+typedef enum {
+        WRITE_STRING_FILE_CREATE = 1,
+        WRITE_STRING_FILE_ATOMIC = 2,
+        WRITE_STRING_FILE_AVOID_NEWLINE = 4,
+} 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 read_one_line_file(const char *fn, char **line);
 int read_full_file(const char *fn, char **contents, size_t *size);
-ssize_t sendfile_full(int out_fd, const char *fn);
+int read_full_stream(FILE *f, char **contents, size_t *size);
+
+int verify_one_line_file(const char *fn, const char *line);
 
 int parse_env_file(const char *fname, const char *separator, ...) _sentinel_;
-int load_env_file(const char *fname, const char *separator, char ***l);
+int load_env_file(FILE *f, const char *fname, const char *separator, char ***l);
+int load_env_file_pairs(FILE *f, const char *fname, const char *separator, char ***l);
+
 int write_env_file(const char *fname, char **l);
 
 int executable_is_script(const char *path, char **interpreter);