mkfs-opts: Add optional "features" parameter.

[libguestfs.git] / src / launch.c

diff --git a/src/launch.c b/src/launch.c
index e4f4728..a7a86b9 100644 (file)
--- a/src/launch.c
+++ b/src/launch.c
@@ -352,7 +352,6 @@ guestfs__launch (guestfs_h *g)
 {
   int r;
   int wfd[2], rfd[2];
-  int tries;
   char unixsock[256];
   struct sockaddr_un addr;
 
@@ -771,6 +770,7 @@ guestfs__launch (guestfs_h *g)
 
 /* Return the location of the tmpdir (eg. "/tmp") and allow users
  * to override it at runtime using $TMPDIR.
+ * http://www.pathname.com/fhs/pub/fhs-2.3.html#TMPTEMPORARYFILES
  */
 const char *
 guestfs_tmpdir (void)
@@ -789,6 +789,23 @@ guestfs_tmpdir (void)
   return tmpdir;
 }
 
+/* Return the location of the persistent tmpdir (eg. "/var/tmp") and
+ * allow users to override it at runtime using $TMPDIR.
+ * http://www.pathname.com/fhs/pub/fhs-2.3.html#VARTMPTEMPORARYFILESPRESERVEDBETWEE
+ */
+const char *
+guestfs___persistent_tmpdir (void)
+{
+  const char *tmpdir;
+
+  tmpdir = "/var/tmp";
+
+  const char *t = getenv ("TMPDIR");
+  if (t) tmpdir = t;
+
+  return tmpdir;
+}
+
 /* Compute Y - X and return the result in milliseconds.
  * Approximately the same as this code:
  * http://www.mpp.mpg.de/~huber/util/timevaldiff.c