X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdebug.c;h=68320a3112cbf0f6cb54599aaf659516192c4eb5;hp=22baa9bff8a5037181c7cb39f3bcf8771e3f8cb2;hb=4fbd283c67831d8ef0f0b49045b3369f3ce036db;hpb=713283f4a67b3a1960ca96ce6608d046fc202d2d

diff --git a/daemon/debug.c b/daemon/debug.c
index 22baa9b..68320a3 100644
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
+#include <dirent.h>
 
 #include "../src/guestfs_protocol.h"
 #include "daemon.h"
@@ -42,27 +45,23 @@ struct cmd {
 };
 
 static char *debug_help (const char *subcmd, int argc, char *const *const argv);
-#if 0
+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_free (const char *subcmd, int argc, char *const *const argv);
-static char *debug_mem (const char *subcmd, int argc, char *const *const argv);
-static char *debug_ps (const char *subcmd, int argc, char *const *const argv);
-#endif
+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 },
-#if 0
+  { "env", debug_env },
   { "fds", debug_fds },
-  { "free", debug_free },
-  { "mem", debug_mem },
-  { "ps", debug_free },
-#endif
+  { "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;
@@ -114,25 +113,144 @@ debug_help (const char *subcmd, int argc, char *const *const argv)
   return r;
 }
 
-#if 0
+/* Show open FDs. */
 static char *
 debug_fds (const char *subcmd, int argc, char *const *const argv)
 {
+  int r;
+  char *out;
+  size_t size;
+  FILE *fp;
+  DIR *dir;
+  struct dirent *d;
+  char fname[256], link[256];
+  struct stat statbuf;
+
+  fp = open_memstream (&out, &size);
+  if (!fp) {
+    reply_with_perror ("open_memstream");
+    return NULL;
+  }
+
+  dir = opendir ("/proc/self/fd");
+  if (!dir) {
+    reply_with_perror ("opendir: /proc/self/fd");
+    fclose (fp);
+    return NULL;
+  }
+
+  while ((d = readdir (dir)) != NULL) {
+    if (strcmp (d->d_name, ".") == 0 || strcmp (d->d_name, "..") == 0)
+      continue;
+
+    snprintf (fname, sizeof fname, "/proc/self/fd/%s", d->d_name);
+
+    r = lstat (fname, &statbuf);
+    if (r == -1) {
+      reply_with_perror ("stat: %s", fname);
+      fclose (fp);
+      free (out);
+      closedir (dir);
+      return NULL;
+    }
+
+    if (S_ISLNK (statbuf.st_mode)) {
+      r = readlink (fname, link, sizeof link - 1);
+      if (r == -1) {
+	reply_with_perror ("readline: %s", fname);
+	fclose (fp);
+	free (out);
+	closedir (dir);
+	return NULL;
+      }
+      link[r] = '\0';
+
+      fprintf (fp, "%2s %s\n", d->d_name, link);
+    } else
+      fprintf (fp, "%2s 0%o\n", d->d_name, statbuf.st_mode);
+  }
+
+  fclose (fp);
+
+  if (closedir (dir) == -1) {
+    reply_with_perror ("closedir");
+    free (out);
+    return NULL;
+  }
+
+  return out;
 }
 
+/* Force a segfault in the daemon. */
 static char *
-debug_free (const char *subcmd, int argc, char *const *const argv)
+debug_segv (const char *subcmd, int argc, char *const *const argv)
 {
+  *(int*)0 = 0;
+  return NULL;
 }
 
+/* Run an arbitrary shell command using /bin/sh from the appliance.
+ *
+ * Note this is somewhat different from the ordinary guestfs_sh command
+ * because it's not using the guest shell, and is not chrooted.
+ *
+ * Also we ignore any errors and you can see the full output if you
+ * add 2>&1 to the end of the command string.
+ */
 static char *
-debug_mem (const char *subcmd, int argc, char *const *const argv)
+debug_sh (const char *subcmd, int argc, char *const *const argv)
 {
+  char *cmd;
+  int len, i, j;
+  char *out;
+
+  if (argc < 1) {
+    reply_with_error ("debug: sh: expecting a command to run");
+    return NULL;
+  }
+
+  /* guestfish splits the parameter(s) into a list of strings,
+   * and we have to reassemble them here.  Not ideal. XXX
+   */
+  for (i = len = 0; i < argc; ++i)
+    len += strlen (argv[i]) + 1;
+  cmd = malloc (len);
+  if (!cmd) {
+    reply_with_perror ("malloc");
+    return NULL;
+  }
+  for (i = j = 0; i < argc; ++i) {
+    len = strlen (argv[i]);
+    memcpy (&cmd[j], argv[i], len);
+    j += len;
+    cmd[j] = ' ';
+    j++;
+  }
+  cmd[j-1] = '\0';
+
+  command (&out, NULL, "/bin/sh", "-c", cmd, NULL);
+  free (cmd);
+  return out;
 }
 
+/* Print the environment that commands get (by running external printenv). */
 static char *
-debug_ps (const char *subcmd, int argc, char *const *const argv)
+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;
+  }
+
+  free (err);
+
+  return out;
 }
-#endif
+
 #endif /* ENABLE_DEBUG_COMMAND */