generator.ml: use new "Pathname" designation

[libguestfs.git] / daemon / debug.c

diff --git a/daemon/debug.c b/daemon/debug.c
index ce760e6..58a5061 100644 (file)
--- 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
@@ -60,8 +60,14 @@ static struct cmd cmds[] = {
 };
 #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 **argv MAYBE_UNUSED)
 {
 #if ENABLE_DEBUG_COMMAND
   int argc, i;
@@ -157,11 +163,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,23 +195,47 @@ 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)
 {
-  int r;
-  char *out, *err;
+  char *cmd;
+  int len, i, j;
+  char *out;
 
-  r = commandv (&out, &err, argv);
-  if (r == -1) {
-    reply_with_error ("sh: %s", err);
-    free (out);
-    free (err);
+  if (argc < 1) {
+    reply_with_error ("debug: sh: expecting a command to run");
     return NULL;
   }
 
-  free (err);
+  /* 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;
 }