X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdebug.c;h=ce760e6f3e373c23672ba64d81d3158026edd41a;hp=6d6d2b59a5f1176aaf7b30e36ca9501aa4fe969c;hb=887290e949d54c6ac4c9b787231e588f84f2367c;hpb=15e0fd573a87488c66cb3a6f0da01f3ab5f2f6ed

diff --git a/daemon/debug.c b/daemon/debug.c
index 6d6d2b5..ce760e6 100644
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -45,12 +45,14 @@ struct cmd {
 };
 
 static char *debug_help (const char *subcmd, int argc, char *const *const argv);
+static char *debug_env (const char *subcmd, int argc, char *const *const argv);
 static char *debug_fds (const char *subcmd, int argc, char *const *const argv);
 static char *debug_segv (const char *subcmd, int argc, char *const *const argv);
 static char *debug_sh (const char *subcmd, int argc, char *const *const argv);
 
 static struct cmd cmds[] = {
   { "help", debug_help },
+  { "env", debug_env },
   { "fds", debug_fds },
   { "segv", debug_segv },
   { "sh", debug_sh },
@@ -59,7 +61,7 @@ static struct cmd cmds[] = {
 #endif
 
 char *
-do_debug (const char *subcmd, char *const *const argv)
+do_debug (char *subcmd, char **argv)
 {
 #if ENABLE_DEBUG_COMMAND
   int argc, i;
@@ -196,7 +198,27 @@ debug_sh (const char *subcmd, int argc, char *const *const argv)
 
   r = commandv (&out, &err, argv);
   if (r == -1) {
-    reply_with_error ("ps: %s", err);
+    reply_with_error ("sh: %s", err);
+    free (out);
+    free (err);
+    return NULL;
+  }
+
+  free (err);
+
+  return out;
+}
+
+/* Print the environment that commands get (by running external printenv). */
+static char *
+debug_env (const char *subcmd, int argc, char *const *const argv)
+{
+  int r;
+  char *out, *err;
+
+  r = command (&out, &err, "printenv", NULL);
+  if (r == -1) {
+    reply_with_error ("printenv: %s", err);
     free (out);
     free (err);
     return NULL;