about summary refs log tree commit diff
path: root/support/temp_file.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-11-18 14:11:09 +0100
committerFlorian Weimer <fweimer@redhat.com>2017-11-18 14:11:09 +0100
commit8adfb0eeffd1888f9b53b8d8677eb1656cd20e47 (patch)
tree1b5cabdb49792cbee8839fee6d907b5d9513a4b0 /support/temp_file.c
parentdf0c40ee3a893238ac11f4c0d876a0c3b49d198d (diff)
downloadglibc-8adfb0eeffd1888f9b53b8d8677eb1656cd20e47.tar.gz
glibc-8adfb0eeffd1888f9b53b8d8677eb1656cd20e47.tar.xz
glibc-8adfb0eeffd1888f9b53b8d8677eb1656cd20e47.zip
support_create_temp_directory: Align behavior with create_temp_file
create_temp_file automatically supplies the test directory and the
XXXXXX suffix.  support_create_temp_directory required the caller to
specify them, which was confusing.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'support/temp_file.c')
-rw-r--r--support/temp_file.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/support/temp_file.c b/support/temp_file.c
index cbd54e2e17..547263a3e4 100644
--- a/support/temp_file.c
+++ b/support/temp_file.c
@@ -89,14 +89,14 @@ create_temp_file (const char *base, char **filename)
 char *
 support_create_temp_directory (const char *base)
 {
-  char *base_copy = xstrdup (base);
-  if (mkdtemp (base_copy) == NULL)
+  char *path = xasprintf ("%s/%sXXXXXX", test_dir, base);
+  if (mkdtemp (path) == NULL)
     {
-      printf ("error: mkdtemp (\"%s\"): %m", base);
+      printf ("error: mkdtemp (\"%s\"): %m", path);
       exit (1);
     }
-  add_temp_file (base_copy);
-  return base_copy;
+  add_temp_file (path);
+  return path;
 }
 
 /* Helper functions called by the test skeleton follow.  */