X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fmake-file.c;h=9e84306cfb04a36d6482a3f740a03290ac9cd960;hb=f50fd75b45786d9cd4f2c98d4076804d46795bec;hp=f163d5e7737c0b6cf8e591b385d3cbd128edd36e;hpb=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;p=pspp

diff --git a/src/data/make-file.c b/src/data/make-file.c
index f163d5e773..9e84306cfb 100644
--- a/src/data/make-file.c
+++ b/src/data/make-file.c
@@ -39,83 +39,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-/* Non ansi compilers may set this */
-#ifndef P_tmpdir
-#define P_tmpdir "/tmp"
-#endif
-
-/* 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)
-{
-  const char *parent_dir;
-
-  assert (file_name != NULL);
-  assert (fd != NULL);
-
-  if (getenv ("TMPDIR") != NULL)
-    parent_dir = getenv ("TMPDIR");
-  else
-    parent_dir = P_tmpdir;
-
-  *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."),
-           *file_name, strerror (errno));
-      free (*file_name);
-      *file_name = NULL;
-      return 0;
-    }
-  return 1;
-}
-
-
-/* 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 and for closing *FP */
-int
-make_unique_file_stream (FILE **fp, char **file_name)
-{
-  static int serial = 0;
-  const char *parent_dir;
-
-
-  /* FIXME:
-     Need to check for pre-existing file name.
-     Need also to pass in the directory instead of using /tmp
-  */
-
-  assert (file_name != NULL);
-  assert (fp != NULL);
-
-  if (getenv ("TMPDIR") != NULL)
-    parent_dir = getenv ("TMPDIR");
-  else
-    parent_dir = P_tmpdir;
-
-  *file_name = xmalloc (strlen (parent_dir) + 32);
-
-
-  sprintf (*file_name, "%s/pspp%d.png", parent_dir, serial++);
-
-  *fp = fopen(*file_name, "w");
-
-  if (! *fp )
-    {
-      msg (ME, _("%s: Creating file: %s."), *file_name, strerror (errno));
-      free (*file_name);
-      *file_name = NULL;
-      return 0;
-    }
-
-  return 1;
-}
-
 struct replace_file
   {
     struct ll ll;
@@ -136,6 +59,7 @@ replace_file_start (const char *file_name, const char *mode,
   struct stat s;
   struct replace_file *rf;
   int fd;
+  int saved_errno = errno;
 
   /* If FILE_NAME represents a special file, write to it directly
      instead of trying to replace it. */
@@ -145,8 +69,9 @@ replace_file_start (const char *file_name, const char *mode,
       fd = open (file_name, O_WRONLY);
       if (fd < 0)
         {
+	  saved_errno = errno;     
           msg (ME, _("Opening %s for writing: %s."),
-               file_name, strerror (errno));
+               file_name, strerror (saved_errno));
           return NULL;
         }
 
@@ -154,8 +79,9 @@ replace_file_start (const char *file_name, const char *mode,
       *fp = fdopen (fd, mode);
       if (*fp == NULL)
         {
-          msg (ME, _("Opening stream for %s: %s."),
-               file_name, strerror (errno));
+	  saved_errno = errno;     
+	  msg (ME, _("Opening stream for %s: %s."),
+               file_name, strerror (saved_errno));
           close (fd);
           return NULL;
         }
@@ -183,8 +109,9 @@ replace_file_start (const char *file_name, const char *mode,
       rf->tmp_name = xasprintf ("%s.tmpXXXXXX", file_name);
       if (gen_tempname (rf->tmp_name, 0, 0600, GT_NOCREATE) < 0)
         {
+	  saved_errno = errno;
           msg (ME, _("Creating temporary file to replace %s: %s."),
-               rf->file_name, strerror (errno));
+               rf->file_name, strerror (saved_errno));
           goto error;
         }
 
@@ -194,8 +121,9 @@ replace_file_start (const char *file_name, const char *mode,
         break;
       if (errno != EEXIST)
         {
+	  saved_errno = errno;
           msg (ME, _("Creating temporary file %s: %s."),
-               rf->tmp_name, strerror (errno));
+               rf->tmp_name, strerror (saved_errno));
           goto error;
         }
       free (rf->tmp_name);
@@ -206,8 +134,9 @@ replace_file_start (const char *file_name, const char *mode,
   *fp = fdopen (fd, mode);
   if (*fp == NULL)
     {
+      saved_errno = errno;
       msg (ME, _("Opening stream for temporary file %s: %s."),
-           rf->tmp_name, strerror (errno));
+           rf->tmp_name, strerror (saved_errno));
       close (fd);
       unlink (rf->tmp_name);
       goto error;
@@ -228,6 +157,7 @@ error:
   *fp = NULL;
   if (tmp_name != NULL)
     *tmp_name = NULL;
+  errno = saved_errno;
   return NULL;
 }
 
@@ -305,7 +235,6 @@ unlink_replace_files (void)
       /* We don't free_replace_file(RF) because calling free is unsafe
          from an asynchronous signal handler. */
       unlink (rf->tmp_name);
-      fflush (stdout);
     }
   unblock_fatal_signals ();
 }