X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flaunch.c;h=a7a86b97f135533a5ec2dfc5349e22d3f25cea19;hb=d2636b0984830d950423dadd936114ff242c4a00;hp=e5bca56e8d3572c34a35fc602ca3fe2797912dc7;hpb=06fef60db5c7a96cb59aa92c4708e10333345e90;p=libguestfs.git

diff --git a/src/launch.c b/src/launch.c
index e5bca56..a7a86b9 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -34,6 +34,7 @@
 #include <sys/select.h>
 #include <dirent.h>
 #include <signal.h>
+#include <assert.h>
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
@@ -101,6 +102,49 @@ add_cmdline (guestfs_h *g, const char *str)
 }
 
 int
+guestfs___checkpoint_cmdline (guestfs_h *g)
+{
+  return g->cmdline_size;
+}
+
+void
+guestfs___rollback_cmdline (guestfs_h *g, int pos)
+{
+  int i;
+
+  assert (g->cmdline_size >= pos);
+
+  for (i = g->cmdline_size - 1; i >= pos; --i)
+    free (g->cmdline[i]);
+
+  g->cmdline_size = pos;
+}
+
+/* Internal command to return the command line. */
+char **
+guestfs__debug_cmdline (guestfs_h *g)
+{
+  int i;
+  char **r;
+
+  if (g->cmdline == NULL) {
+    r = safe_malloc (g, sizeof (char *) * 1);
+    r[0] = NULL;
+    return r;
+  }
+
+  r = safe_malloc (g, sizeof (char *) * (g->cmdline_size + 1));
+  r[0] = safe_strdup (g, g->qemu); /* g->cmdline[0] is always NULL */
+
+  for (i = 1; i < g->cmdline_size; ++i)
+    r[i] = safe_strdup (g, g->cmdline[i]);
+
+  r[g->cmdline_size] = NULL;
+
+  return r;                     /* caller frees */
+}
+
+int
 guestfs__config (guestfs_h *g,
                  const char *qemu_param, const char *qemu_value)
 {
@@ -308,7 +352,6 @@ guestfs__launch (guestfs_h *g)
 {
   int r;
   int wfd[2], rfd[2];
-  int tries;
   char unixsock[256];
   struct sockaddr_un addr;
 
@@ -727,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)
@@ -745,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