In the daemon, change all const char * parameters to char *.

[libguestfs.git] / daemon / debug.c

diff --git a/daemon/debug.c b/daemon/debug.c
index e4a7f05..ce760e6 100644 (file)
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -45,19 +45,23 @@ 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 },
   { NULL, NULL }
 };
 #endif
 
 char *
-do_debug (const char *subcmd, char *const *const argv)
+do_debug (char *subcmd, char **argv)
 {
 #if ENABLE_DEBUG_COMMAND
   int argc, i;
@@ -177,6 +181,14 @@ debug_fds (const char *subcmd, int argc, char *const *const argv)
   return out;
 }
 
+/* Force a segfault in the daemon. */
+static char *
+debug_segv (const char *subcmd, int argc, char *const *const argv)
+{
+  *(int*)0 = 0;
+  return NULL;
+}
+
 /* Run an arbitrary shell command. */
 static char *
 debug_sh (const char *subcmd, int argc, char *const *const argv)
@@ -186,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;