projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
REGRESSION: Fix issues found by by review
[pspp]
/
src
/
libpspp
/
temp-file.c
diff --git
a/src/libpspp/temp-file.c
b/src/libpspp/temp-file.c
index 9d3c392659753043667af822b9bbfe7bd3e1b0f0..d121cb9e2e5fc42466aeb0f68fd42bdb5f9daf61 100644
(file)
--- a/
src/libpspp/temp-file.c
+++ b/
src/libpspp/temp-file.c
@@
-40,6
+40,7
@@
*/
*/
+static void cleanup (void);
static struct temp_dir *temp_dir;
struct hmapx map;
static struct temp_dir *temp_dir;
struct hmapx map;
@@
-51,6
+52,30
@@
setup (void)
temp_dir = create_temp_dir ("pspp", NULL, true);
}
temp_dir = create_temp_dir ("pspp", NULL, true);
}
+static void
+initialise (void)
+{
+ if (temp_dir == NULL)
+ {
+ setup ();
+ if (temp_dir == NULL)
+ return ;
+ atexit (cleanup);
+ }
+}
+
+
+const char *
+temp_dir_name (void)
+{
+ initialise ();
+
+ if (temp_dir)
+ return temp_dir->dir_name;
+
+ return NULL;
+}
+
static void
cleanup (void)
{
static void
cleanup (void)
{
@@
-74,13
+99,9
@@
create_temp_file (void)
char *file_name;
FILE *stream;
char *file_name;
FILE *stream;
+ initialise ();
if (temp_dir == NULL)
if (temp_dir == NULL)
- {
- setup ();
- if (temp_dir == NULL)
- return NULL;
- atexit (cleanup);
- }
+ return NULL;
file_name = xasprintf ("%s/%d", temp_dir->dir_name, idx++);
register_temp_file (temp_dir, file_name);
file_name = xasprintf ("%s/%d", temp_dir->dir_name, idx++);
register_temp_file (temp_dir, file_name);