X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fmake-file.h;h=3861f35109af866978b5938d0bbc34389e6c059b;hb=c0a213f7ed487273797d579bad952bca983240ba;hp=ce56758ee87d2b9abc9d80f57e0958a636d30e5c;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp

diff --git a/src/data/make-file.h b/src/data/make-file.h
index ce56758ee8..3861f35109 100644
--- a/src/data/make-file.h
+++ b/src/data/make-file.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,19 +14,37 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-#ifndef MKFILE_H
-#define MKFILE_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);
-
-
-/* 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) ;
+#ifndef MAKE_FILE_H
+#define MAKE_FILE_H
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+/* 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.
+
+   Special files are an exception: they are not atomically
+   replaced but simply opened for writing.
+
+   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);
+
+/* Commits or aborts the replacement of a (potentially) existing
+   file by a new file, using the ticket returned by
+   replace_file_start.  Returns success. */
+bool replace_file_commit (struct replace_file *);
+bool replace_file_abort (struct replace_file *);
 
 #endif /* make-file.h */