X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Flaunch.c;h=f9d8329f93d381a2badf554e6f54ca4f8fff153c;hb=5a8c8b8bf6e846b8d2d7e710f814d24d9a0183c3;hp=e0ad165fc30ceb38b77cb2ff2a1c21c541f6dd83;hpb=6d276dae8d1bbb54d8708c94d23879d39f5fd4a3;p=libguestfs.git

diff --git a/src/launch.c b/src/launch.c
index e0ad165..f9d8329 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -249,10 +249,7 @@ guestfs__launch (guestfs_h *g)
 
   /* Make the temporary directory. */
   if (!g->tmpdir) {
-    const char *tmpdir = guestfs___tmpdir ();
-    char dir_template[strlen (tmpdir) + 32];
-    sprintf (dir_template, "%s/libguestfsXXXXXX", tmpdir);
-
+    TMP_TEMPLATE_ON_STACK (dir_template);
     g->tmpdir = safe_strdup (g, dir_template);
     if (mkdtemp (g->tmpdir) == NULL) {
       perrorf (g, _("%s: cannot create temporary directory"), dir_template);
@@ -649,8 +646,11 @@ guestfs__launch (guestfs_h *g)
   return -1;
 }
 
+/* Return the location of the tmpdir (eg. "/tmp") and allow users
+ * to override it at runtime using $TMPDIR.
+ */
 const char *
-guestfs___tmpdir (void)
+guestfs_tmpdir (void)
 {
   const char *tmpdir;