X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=daemon%2Fcommand.c;h=b2350ecb311c2c4e635138e83dc44781aab05854;hb=088d0c53cfe0dcb20b87707a9055175b2fd6b72f;hp=f7a6dcf6d805df431b67e23bf0822e36e9ddfd04;hpb=6bda071b5cd8393b37653687027c4ae6c6cf3804;p=libguestfs.git diff --git a/daemon/command.c b/daemon/command.c index f7a6dcf..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 (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); }