fbuf: New data structure for buffered file I/O.

[pspp] / src / data / make-file.h

diff --git a/src/data/make-file.h b/src/data/make-file.h
index 31795bebe58db8d4b66d187c2ba9f3978369d7e2..d908db336681c9b4179c126abe601f7b1c34f126 100644 (file)
--- a/src/data/make-file.h
+++ b/src/data/make-file.h
@@ -21,37 +21,31 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-/* Creates a temporary file and stores its name in *FILE_NAME and
-   a file descriptor for it in *FD.  Returns success.  Caller is
-   responsible for freeing *FILE_NAME. */
-int make_temp_file (int *fd, char **file_name);
+struct file_handle;
 
+/* Prepares to atomically replace a (potentially) existing file by a new file,
+   by creating a temporary file with the given PERMISSIONS bits.
 
-/* Creates a temporary file and stores its name in *FILE_NAME and
-   a file stream for it in *FP.  Returns success.  Caller is
-   responsible for freeing *FILE_NAME. */
-int make_unique_file_stream (FILE **fp, char **file_name) ;
+   Special files are an exception: they are not atomically
+   replaced but simply opened for writing.
 
+   If successful, returns a ticket that can be used to commit or abort the file
+   replacement.  If neither action is taken, program termination via signal
+   will abort.  Depending on the function, stores a file descriptor in *FD or a
+   stream in *FP for the newly opened file.  The descriptor or stream is opened
+   for writing a binary file if BINARY is true, otherwise a text file (this
+   disctinction only matters on Windows).
 
-/* Prepares to atomically replace a (potentially) existing file
-   by a new file, by creating a temporary file with the given
-   PERMISSIONS bits in the same directory as *FILE_NAME.
+   On error, returns NULL and stores NULL in *FP or -1 in *FD.
 
-   Special files are an exception: they are not atomically
-   replaced but simply opened for writing.
+   The caller is responsible for closing *FP or *FD. */
 
-   If successful, stores the temporary file's name in *TMP_NAME
-   and a stream for it opened according to MODE (which should be
-   "w" or "wb") in *FP.  Returns a ticket that can be used to
-   commit or abort the file replacement.  If neither action has
-   yet been taken, program termination via signal will cause
-   *TMP_FILE to be unlinked.
-
-   The caller is responsible for closing *FP, but *TMP_NAME is
-   owned by the callee. */
-struct replace_file *replace_file_start (const char *file_name,
-                                         const char *mode, mode_t permissions,
-                                         FILE **fp, char **tmp_name);
+struct replace_file *replace_file_start (const struct file_handle *fh,
+                                         bool binary, mode_t permissions,
+                                         FILE **fp);
+struct replace_file *replace_file_start_fd (const struct file_handle *fh,
+                                            bool binary,
+                                            mode_t permissions, int *fd);
 
 /* Commits or aborts the replacement of a (potentially) existing
    file by a new file, using the ticket returned by