X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fcommand.c;h=b2350ecb311c2c4e635138e83dc44781aab05854;hp=4420cba84d496e48d83249012c5e5ae8b0cd839c;hb=088d0c53cfe0dcb20b87707a9055175b2fd6b72f;hpb=27566d8323e4a8af59f5649aeeaef97ebd55cbd0

diff --git a/daemon/command.c b/daemon/command.c
index 4420cba..b2350ec 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -27,7 +27,7 @@
 #include "actions.h"
 
 char *
-do_command (char **argv)
+do_command (char *const *argv)
 {
   char *out, *err;
   int r;
@@ -36,7 +36,7 @@ do_command (char **argv)
   int dev_ok, dev_pts_ok, proc_ok, selinux_ok, sys_ok;
 
   /* We need a root filesystem mounted to do this. */
-  NEED_ROOT (NULL);
+  NEED_ROOT (return NULL);
 
   /* Conveniently, argv is already a NULL-terminated argv-style array
    * of parameters, so we can pass it straight in to our internal
@@ -85,7 +85,7 @@ do_command (char **argv)
   sys_ok = r != -1;
 
   CHROOT_IN;
-  r = commandv (&out, &err, argv);
+  r = commandv (&out, &err, (const char * const *) argv);
   CHROOT_OUT;
 
   if (sys_ok) command (NULL, NULL, "umount", sysroot_sys, NULL);
@@ -113,7 +113,7 @@ do_command (char **argv)
 }
 
 char **
-do_command_lines (char **argv)
+do_command_lines (char *const *argv)
 {
   char *out;
   char **lines;
@@ -132,17 +132,17 @@ do_command_lines (char **argv)
 }
 
 char *
-do_sh (char *command)
+do_sh (const char *cmd)
 {
-  char *argv[] = { "/bin/sh", "-c", command, NULL };
+  const char *argv[] = { "/bin/sh", "-c", cmd, NULL };
 
-  return do_command (argv);
+  return do_command ((char **) argv);
 }
 
 char **
-do_sh_lines (char *command)
+do_sh_lines (const char *cmd)
 {
-  char *argv[] = { "/bin/sh", "-c", command, NULL };
+  const char *argv[] = { "/bin/sh", "-c", cmd, NULL };
 
-  return do_command_lines (argv);
+  return do_command_lines ((char **) argv);
 }