X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fcommand.c;h=b2350ecb311c2c4e635138e83dc44781aab05854;hb=c477e2fb78347728aaacbbc89666dcda1481a4b9;hp=9e23e5723b04463bf57f32166c35a29fbcc6e69e;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;p=libguestfs.git

diff --git a/daemon/command.c b/daemon/command.c
index 9e23e57..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;
@@ -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 (const 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 (const 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);
 }