X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdebug.c;h=04c52f0050f4f5b167096c23426efc9c5ff69654;hp=ce760e6f3e373c23672ba64d81d3158026edd41a;hb=9353c6253d5fac1648b13ad9958468a2d9f6ad6f;hpb=56bef498f46ac3dd580f4bde3c8f3ed2fe688826

diff --git a/daemon/debug.c b/daemon/debug.c
index ce760e6..04c52f0 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
@@ -47,6 +47,8 @@ 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_ls (const char *subcmd, int argc, char *const *const argv);
+static char *debug_ll (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);
 
@@ -54,14 +56,22 @@ static struct cmd cmds[] = {
   { "help", debug_help },
   { "env", debug_env },
   { "fds", debug_fds },
+  { "ls", debug_ls },
+  { "ll", debug_ll },
   { "segv", debug_segv },
   { "sh", debug_sh },
   { NULL, NULL }
 };
 #endif
 
+#if ! ENABLE_DEBUG_COMMAND
+# define MAYBE_UNUSED ATTRIBUTE_UNUSED
+#else
+# define MAYBE_UNUSED /* empty */
+#endif
+
 char *
-do_debug (char *subcmd, char **argv)
+do_debug (const char *subcmd MAYBE_UNUSED, char *const *argv MAYBE_UNUSED)
 {
 #if ENABLE_DEBUG_COMMAND
   int argc, i;
@@ -70,7 +80,7 @@ do_debug (char *subcmd, char **argv)
     argc++;
 
   for (i = 0; cmds[i].cmd != NULL; ++i) {
-    if (strcasecmp (subcmd, cmds[i].cmd) == 0)
+    if (STRCASEEQ (subcmd, cmds[i].cmd))
       return cmds[i].f (subcmd, argc, argv);
   }
 
@@ -157,11 +167,11 @@ debug_fds (const char *subcmd, int argc, char *const *const argv)
     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;
+        reply_with_perror ("readline: %s", fname);
+        fclose (fp);
+        free (out);
+        closedir (dir);
+        return NULL;
       }
       link[r] = '\0';
 
@@ -189,16 +199,90 @@ debug_segv (const char *subcmd, int argc, char *const *const argv)
   return NULL;
 }
 
-/* Run an arbitrary shell command. */
+/* 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_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_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;
+}
+
+/* List files in the appliance. */
+static char *
+debug_ls (const char *subcmd, int argc, char *const *const argv)
+{
+  int len = count_strings (argv);
+  const char *cargv[len+3];
+  int i;
+
+  cargv[0] = "ls";
+  cargv[1] = "-a";
+  for (i = 0; i < len; ++i)
+    cargv[2+i] = argv[i];
+  cargv[2+len] = NULL;
+
   int r;
   char *out, *err;
 
-  r = commandv (&out, &err, argv);
+  r = commandv (&out, &err, (void *) cargv);
   if (r == -1) {
-    reply_with_error ("sh: %s", err);
+    reply_with_error ("ls: %s", err);
     free (out);
     free (err);
     return NULL;
@@ -209,16 +293,26 @@ debug_sh (const char *subcmd, int argc, char *const *const argv)
   return out;
 }
 
-/* Print the environment that commands get (by running external printenv). */
+/* List files in the appliance. */
 static char *
-debug_env (const char *subcmd, int argc, char *const *const argv)
+debug_ll (const char *subcmd, int argc, char *const *const argv)
 {
+  int len = count_strings (argv);
+  const char *cargv[len+3];
+  int i;
+
+  cargv[0] = "ls";
+  cargv[1] = "-la";
+  for (i = 0; i < len; ++i)
+    cargv[2+i] = argv[i];
+  cargv[2+len] = NULL;
+
   int r;
   char *out, *err;
 
-  r = command (&out, &err, "printenv", NULL);
+  r = commandv (&out, &err, (void *) cargv);
   if (r == -1) {
-    reply_with_error ("printenv: %s", err);
+    reply_with_error ("ll: %s", err);
     free (out);
     free (err);
     return NULL;