X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fmake-file.c;h=e6161448aa10308e4c76baa5047aaecf1d6b45bb;hb=04fb909bd65eee66428d131ff34a6e1fde42e243;hp=ed94f04c4adf7888e93dae3580ea403815b816af;hpb=5fd22ca7771c8175ef05e91e1194c3c4096337f4;p=pspp-builds.git

diff --git a/src/data/make-file.c b/src/data/make-file.c
index ed94f04c..e6161448 100644
--- a/src/data/make-file.c
+++ b/src/data/make-file.c
@@ -23,10 +23,10 @@
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
-#include "filename.h"
+#include "file-name.h"
 #include "make-file.h"
-#include "message.h"
-#include "alloc.h"
+#include <libpspp/message.h>
+#include <libpspp/alloc.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -36,15 +36,15 @@
 #define P_tmpdir "/tmp"
 #endif
 
-/* Creates a temporary file and stores its name in *FILENAME and
+/* 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 *FILENAME. */
+   responsible for freeing *FILE_NAME. */
 int
-make_temp_file (int *fd, char **filename)
+make_temp_file (int *fd, char **file_name)
 {
   const char *parent_dir;
 
-  assert (filename != NULL);
+  assert (file_name != NULL);
   assert (fd != NULL);
 
   if (getenv ("TMPDIR") != NULL)
@@ -52,26 +52,26 @@ make_temp_file (int *fd, char **filename)
   else
     parent_dir = P_tmpdir;
 
-  *filename = xmalloc (strlen (parent_dir) + 32);
-  sprintf (*filename, "%s%cpsppXXXXXX", parent_dir, DIR_SEPARATOR);
-  *fd = mkstemp (*filename);
+  *file_name = xmalloc (strlen (parent_dir) + 32);
+  sprintf (*file_name, "%s/psppXXXXXX", parent_dir);
+  *fd = mkstemp (*file_name);
   if (*fd < 0)
     {
       msg (ME, _("%s: Creating temporary file: %s."),
-           *filename, strerror (errno));
-      free (*filename);
-      *filename = NULL;
+           *file_name, strerror (errno));
+      free (*file_name);
+      *file_name = NULL;
       return 0;
     }
   return 1;
 }
 
 
-/* Creates a temporary file and stores its name in *FILENAME and
+/* 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 *FILENAME and for closing *FP */
+   responsible for freeing *FILE_NAME and for closing *FP */
 int
-make_unique_file_stream (FILE **fp, char **filename)
+make_unique_file_stream (FILE **fp, char **file_name)
 {
   static int serial = 0;
   const char *parent_dir;
@@ -82,7 +82,7 @@ make_unique_file_stream (FILE **fp, char **filename)
      Need also to pass in the directory instead of using /tmp 
   */
 
-  assert (filename != NULL);
+  assert (file_name != NULL);
   assert (fp != NULL);
 
   if (getenv ("TMPDIR") != NULL)
@@ -90,18 +90,18 @@ make_unique_file_stream (FILE **fp, char **filename)
   else
     parent_dir = P_tmpdir;
 
-  *filename = xmalloc (strlen (parent_dir) + 32);
+  *file_name = xmalloc (strlen (parent_dir) + 32);
 
 
-  sprintf (*filename, "%s%cpspp%d.png", parent_dir, DIR_SEPARATOR, serial++);
+  sprintf (*file_name, "%s/pspp%d.png", parent_dir, serial++);
 
-  *fp = fopen(*filename, "w");
+  *fp = fopen(*file_name, "w");
 
   if (! *fp )
     {
-      msg (ME, _("%s: Creating file: %s."), *filename, strerror (errno));
-      free (*filename);
-      *filename = NULL;
+      msg (ME, _("%s: Creating file: %s."), *file_name, strerror (errno));
+      free (*file_name);
+      *file_name = NULL;
       return 0;
     }