X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdebug.c;h=ce760e6f3e373c23672ba64d81d3158026edd41a;hp=25fe64f129e5d7cd821271b4972a9af19439e5b2;hb=ad8a256f54a6cb99f89bb444c8597a152a793dce;hpb=21dbad6b95d5355f622e74c9c9d8a547c04e6e00

diff --git a/daemon/debug.c b/daemon/debug.c
index 25fe64f..ce760e6 100644
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -45,21 +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_mem (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 },
-  { "mem", debug_mem },
+  { "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;
@@ -116,15 +118,24 @@ static char *
 debug_fds (const char *subcmd, int argc, char *const *const argv)
 {
   int r;
-  char *out = NULL;
+  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;
   }
 
@@ -137,6 +148,7 @@ debug_fds (const char *subcmd, int argc, char *const *const argv)
     r = lstat (fname, &statbuf);
     if (r == -1) {
       reply_with_perror ("stat: %s", fname);
+      fclose (fp);
       free (out);
       closedir (dir);
       return NULL;
@@ -146,24 +158,20 @@ debug_fds (const char *subcmd, int argc, char *const *const argv)
       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';
 
-      r = catprintf (&out, "%2s %s\n", d->d_name, link);
+      fprintf (fp, "%2s %s\n", d->d_name, link);
     } else
-      r = catprintf (&out, "%2s 0%o\n", d->d_name, statbuf.st_mode);
-
-    if (r == -1) {
-      reply_with_perror ("catprintf");
-      free (out);
-      closedir (dir);
-      return NULL;
-    }
+      fprintf (fp, "%2s 0%o\n", d->d_name, statbuf.st_mode);
   }
 
+  fclose (fp);
+
   if (closedir (dir) == -1) {
     reply_with_perror ("closedir");
     free (out);
@@ -173,44 +181,44 @@ debug_fds (const char *subcmd, int argc, char *const *const argv)
   return out;
 }
 
-/* Report how much memory we can blindly allocate before
- * we get an error.
- */
+/* Force a segfault in the daemon. */
 static char *
-debug_mem (const char *subcmd, int argc, char *const *const argv)
+debug_segv (const char *subcmd, int argc, char *const *const argv)
 {
-  char *mem = NULL, *p;
-  int size = 0;
-  char *buf;
+  *(int*)0 = 0;
+  return NULL;
+}
 
-  for (;;) {
-    size += 128 * 1024;
-    p = realloc (mem, size);
-    if (p == NULL) {
-      free (mem);
-      break;
-    }
-    mem = p;
-  }
+/* Run an arbitrary shell command. */
+static char *
+debug_sh (const char *subcmd, int argc, char *const *const argv)
+{
+  int r;
+  char *out, *err;
 
-  if (asprintf (&buf, "%.1f MBytes", size / 1024.0 / 1024.0) == -1) {
-    reply_with_perror ("asprintf");
+  r = commandv (&out, &err, argv);
+  if (r == -1) {
+    reply_with_error ("sh: %s", err);
+    free (out);
+    free (err);
     return NULL;
   }
 
-  return buf;			/* caller frees */
+  free (err);
+
+  return out;
 }
 
-/* Run an arbitrary shell command. */
+/* Print the environment that commands get (by running external printenv). */
 static char *
-debug_sh (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 = commandv (&out, &err, argv);
+  r = command (&out, &err, "printenv", NULL);
   if (r == -1) {
-    reply_with_error ("ps: %s", err);
+    reply_with_error ("printenv: %s", err);
     free (out);
     free (err);
     return NULL;