#include <config.h>
#include "data/make-file.h"
+#include "libpspp/i18n.h"
#include <assert.h>
#include <errno.h>
#include <unistd.h>
#include "data/file-name.h"
+#include "data/file-handle-def.h"
#include "libpspp/ll.h"
#include "libpspp/message.h"
char *file_name;
char *tmp_name;
};
-
+
static struct ll_list all_files = LL_INITIALIZER (all_files);
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)
+replace_file_start (const struct file_handle *fh, const char *mode,
+ mode_t permissions, FILE **fp)
{
static bool registered;
struct stat s;
int fd;
int saved_errno = errno;
+ const char *file_name = fh_get_file_name (fh);
+
/* 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))
saved_errno = errno;
msg (ME, _("Opening %s for writing: %s."),
file_name, strerror (saved_errno));
- errno = saved_errno;
return NULL;
}
msg (ME, _("Opening stream for %s: %s."),
file_name, strerror (saved_errno));
close (fd);
- errno = saved_errno;
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;
}
for (;;)
{
/* Generate unique temporary file name. */
- rf->tmp_name = xasprintf ("%s.tmpXXXXXX", file_name);
+ rf->tmp_name = xasprintf ("%stmpXXXXXX", 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));
saved_errno = errno;
+ msg (ME, _("Creating temporary file to replace %s: %s."),
+ rf->file_name, strerror (saved_errno));
goto error;
}
break;
if (errno != EEXIST)
{
- msg (ME, _("Creating temporary file %s: %s."),
- rf->tmp_name, strerror (errno));
saved_errno = errno;
+ msg (ME, _("Creating temporary file %s: %s."),
+ rf->tmp_name, strerror (saved_errno));
goto error;
}
free (rf->tmp_name);
*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);
- saved_errno = errno;
goto error;
}
ll_push_head (&all_files, &rf->ll);
unblock_fatal_signals ();
- if (tmp_name != NULL)
- *tmp_name = rf->tmp_name;
-
return rf;
error:
unblock_fatal_signals ();
free_replace_file (rf);
*fp = NULL;
- if (tmp_name != NULL)
- *tmp_name = NULL;
errno = saved_errno;
return NULL;
}