X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fmake-file.c;h=63792e90b4a960b406493131b63e73b4f2e86cf7;hb=refs%2Fbuilds%2F20110315030503%2Fpspp;hp=051905b821ad0fbd3ec5a8329c8e817be6550816;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp
diff --git a/src/data/make-file.c b/src/data/make-file.c
index 051905b821..63792e90b4 100644
--- 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,97 +15,219 @@
along with this program. If not, see . */
#include
+
+#include "data/make-file.h"
+
#include
-#include
-#include
#include
+#include
#include
-#include "file-name.h"
-#include "make-file.h"
-#include
+#include
+#include
+#include
+#include
+
+#include "data/file-name.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.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)
-/* Non ansi compilers may set this */
-#ifndef P_tmpdir
-#define P_tmpdir "/tmp"
-#endif
+struct replace_file
+ {
+ struct ll ll;
+ char *file_name;
+ char *tmp_name;
+ };
+
+static struct ll_list all_files = LL_INITIALIZER (all_files);
-/* 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)
+static void free_replace_file (struct replace_file *);
+static void unlink_replace_files (void);
+
+struct replace_file *
+replace_file_start (const char *file_name, const char *mode,
+ mode_t permissions, FILE **fp, char **tmp_name)
{
- const char *parent_dir;
+ static bool registered;
+ struct stat s;
+ struct replace_file *rf;
+ int fd;
+
+ /* If FILE_NAME represents a special file, write to it directly
+ instead of trying to replace it. */
+ if (stat (file_name, &s) == 0 && !S_ISREG (s.st_mode))
+ {
+ /* Open file descriptor. */
+ fd = open (file_name, O_WRONLY);
+ if (fd < 0)
+ {
+ msg (ME, _("Opening %s for writing: %s."),
+ file_name, strerror (errno));
+ return NULL;
+ }
+
+ /* Open file as stream. */
+ *fp = fdopen (fd, mode);
+ if (*fp == NULL)
+ {
+ msg (ME, _("Opening stream for %s: %s."),
+ file_name, strerror (errno));
+ close (fd);
+ return NULL;
+ }
+
+ rf = xmalloc (sizeof *rf);
+ rf->file_name = NULL;
+ rf->tmp_name = xstrdup (file_name);
+ if (tmp_name != NULL)
+ *tmp_name = rf->tmp_name;
+ return rf;
+ }
- assert (file_name != NULL);
- assert (fd != NULL);
+ if (!registered)
+ {
+ at_fatal_signal (unlink_replace_files);
+ registered = true;
+ }
+ block_fatal_signals ();
+
+ rf = xmalloc (sizeof *rf);
+ rf->file_name = xstrdup (file_name);
+ for (;;)
+ {
+ /* Generate unique temporary file name. */
+ rf->tmp_name = xasprintf ("%s.tmpXXXXXX", file_name);
+ 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));
+ goto error;
+ }
+
+ /* Create file by that name. */
+ fd = open (rf->tmp_name, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, permissions);
+ if (fd >= 0)
+ break;
+ if (errno != EEXIST)
+ {
+ msg (ME, _("Creating temporary file %s: %s."),
+ rf->tmp_name, strerror (errno));
+ goto error;
+ }
+ free (rf->tmp_name);
+ }
- 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)
+ /* Open file as stream. */
+ *fp = fdopen (fd, mode);
+ if (*fp == NULL)
{
- msg (ME, _("%s: Creating temporary file: %s."),
- *file_name, strerror (errno));
- free (*file_name);
- *file_name = NULL;
- return 0;
+ msg (ME, _("Opening stream for temporary file %s: %s."),
+ rf->tmp_name, strerror (errno));
+ close (fd);
+ unlink (rf->tmp_name);
+ goto error;
}
- return 1;
-}
+ /* Register file for deletion. */
+ ll_push_head (&all_files, &rf->ll);
+ unblock_fatal_signals ();
-/* 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;
+ if (tmp_name != NULL)
+ *tmp_name = rf->tmp_name;
+ return rf;
- /* FIXME:
- Need to check for pre-existing file name.
- Need also to pass in the directory instead of using /tmp
- */
+error:
+ unblock_fatal_signals ();
+ free_replace_file (rf);
+ *fp = NULL;
+ if (tmp_name != NULL)
+ *tmp_name = NULL;
+ return NULL;
+}
- assert (file_name != NULL);
- assert (fp != NULL);
+bool
+replace_file_commit (struct replace_file *rf)
+{
+ bool ok = true;
+
+ if (rf->file_name != NULL)
+ {
+ int save_errno;
- if (getenv ("TMPDIR") != NULL)
- parent_dir = getenv ("TMPDIR");
+ block_fatal_signals ();
+ ok = rename (rf->tmp_name, rf->file_name) == 0;
+ save_errno = errno;
+ ll_remove (&rf->ll);
+ unblock_fatal_signals ();
+
+ if (!ok)
+ msg (ME, _("Replacing %s by %s: %s."),
+ rf->tmp_name, rf->file_name, strerror (save_errno));
+ }
else
- parent_dir = P_tmpdir;
+ {
+ /* Special file: no temporary file to rename. */
+ }
+ free_replace_file (rf);
- *file_name = xmalloc (strlen (parent_dir) + 32);
+ return ok;
+}
+bool
+replace_file_abort (struct replace_file *rf)
+{
+ bool ok = true;
- sprintf (*file_name, "%s/pspp%d.png", parent_dir, serial++);
+ if (rf->file_name != NULL)
+ {
+ int save_errno;
- *fp = fopen(*file_name, "w");
+ block_fatal_signals ();
+ ok = unlink (rf->tmp_name) == 0;
+ save_errno = errno;
+ ll_remove (&rf->ll);
+ unblock_fatal_signals ();
- if (! *fp )
+ if (!ok)
+ msg (ME, _("Removing %s: %s."), rf->tmp_name, strerror (save_errno));
+ }
+ else
{
- msg (ME, _("%s: Creating file: %s."), *file_name, strerror (errno));
- free (*file_name);
- *file_name = NULL;
- return 0;
+ /* Special file: no temporary file to unlink. */
}
+ free_replace_file (rf);
- return 1;
+ return ok;
}
+static void
+free_replace_file (struct replace_file *rf)
+{
+ free (rf->file_name);
+ free (rf->tmp_name);
+ free (rf);
+}
+static void
+unlink_replace_files (void)
+{
+ struct replace_file *rf;
-
+ block_fatal_signals ();
+ ll_for_each (rf, struct replace_file, ll, &all_files)
+ {
+ /* We don't free_replace_file(RF) because calling free is unsafe
+ from an asynchronous signal handler. */
+ unlink (rf->tmp_name);
+ }
+ unblock_fatal_signals ();
+}