make-file: Fix #includes.

[pspp-builds.git] / src / data / make-file.c

diff --git a/src/data/make-file.c b/src/data/make-file.c
index 807adc50d9d112de7b47459f0a06a98a4786651f..f163d5e7737c0b6cf8e591b385d3cbd128edd36e 100644 (file)
--- a/src/data/make-file.c
+++ b/src/data/make-file.c
@@ -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
@@ -15,22 +15,26 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
+#include "data/make-file.h"
+
 #include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <stdio.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
-#include <data/file-name.h>
-#include <data/make-file.h>
-#include <libpspp/ll.h>
-#include <libpspp/message.h>
+#include "data/file-name.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
 
-#include "fatal-signal.h"
-#include "tempname.h"
-#include "xalloc.h"
+#include "gl/fatal-signal.h"
+#include "gl/tempname.h"
+#include "gl/xalloc.h"
+#include "gl/xvasprintf.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -177,7 +181,7 @@ replace_file_start (const char *file_name, const char *mode,
     {
       /* Generate unique temporary file name. */
       rf->tmp_name = xasprintf ("%s.tmpXXXXXX", file_name);
-      if (gen_tempname (rf->tmp_name, GT_NOCREATE) < 0)
+      if (gen_tempname (rf->tmp_name, 0, 0600, GT_NOCREATE) < 0)
         {
           msg (ME, _("Creating temporary file to replace %s: %s."),
                rf->file_name, strerror (errno));
@@ -185,7 +189,7 @@ replace_file_start (const char *file_name, const char *mode,
         }
 
       /* Create file by that name. */
-      fd = open (rf->tmp_name, O_WRONLY | O_CREAT | O_EXCL, permissions);
+      fd = open (rf->tmp_name, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, permissions);
       if (fd >= 0)
         break;
       if (errno != EEXIST)