X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fcommand.c;h=b2350ecb311c2c4e635138e83dc44781aab05854;hb=747eb7138ada2c999abc686fc5de18bcad96a1b7;hp=9fbbd95931d34be62f6b8397f0dd348a87370c02;hpb=adf20c0c4d9f488d55254f54a79079b9cacbde8d;p=libguestfs.git

diff --git a/daemon/command.c b/daemon/command.c
index 9fbbd95..b2350ec 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -85,7 +85,7 @@ do_command (char *const *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);
@@ -132,17 +132,17 @@ do_command_lines (char *const *argv)
 }
 
 char *
-do_sh (const char *command)
+do_sh (const char *cmd)
 {
-  const char *argv[] = { "/bin/sh", "-c", command, NULL };
+  const char *argv[] = { "/bin/sh", "-c", cmd, NULL };
 
   return do_command ((char **) argv);
 }
 
 char **
-do_sh_lines (const char *command)
+do_sh_lines (const char *cmd)
 {
-  const char *argv[] = { "/bin/sh", "-c", command, NULL };
+  const char *argv[] = { "/bin/sh", "-c", cmd, NULL };
 
   return do_command_lines ((char **) argv);
 }