X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdaemon.h;h=8ad7b7c7d182e1a6202c8e4aaf4ec301d0b6a310;hp=bd14b121b2212125c05df32ab49502af6a000302;hb=d901cc916102f1aaccfb73396b48aa303e5b8cd7;hpb=170f262f0413de843af62b968f6d12c1c476ae7f diff --git a/daemon/daemon.h b/daemon/daemon.h index bd14b12..8ad7b7c 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -41,8 +41,15 @@ extern void free_strings (char **argv); extern void free_stringslen (char **argv, int len); extern int command (char **stdoutput, char **stderror, const char *name, ...); +extern int commandr (char **stdoutput, char **stderror, const char *name, ...); extern int commandv (char **stdoutput, char **stderror, char * const* const argv); +extern int commandrv (char **stdoutput, char **stderror, + char * const* const argv); + +extern char **split_lines (char *str); + +extern int shell_quote (char *out, int len, const char *in); extern int verbose; @@ -90,7 +97,9 @@ extern void send_file_end (int cancel); /* only call this if there is a FileOut parameter */ extern void reply (xdrproc_t xdrp, char *ret); -/* Helper for functions that need a root filesystem mounted. */ +/* Helper for functions that need a root filesystem mounted. + * NB. Cannot be used for FileIn functions. + */ #define NEED_ROOT(errcode) \ do { \ if (!root_mounted) { \ @@ -100,7 +109,9 @@ extern void reply (xdrproc_t xdrp, char *ret); } \ while (0) -/* Helper for functions that need an argument ("path") that is absolute. */ +/* Helper for functions that need an argument ("path") that is absolute. + * NB. Cannot be used for FileIn functions. + */ #define ABS_PATH(path,errcode) \ do { \ if ((path)[0] != '/') { \ @@ -109,7 +120,9 @@ extern void reply (xdrproc_t xdrp, char *ret); } \ } while (0) -/* Helper for functions that need an argument ("path") that is a device. */ +/* Helper for functions that need an argument ("path") that is a device. + * NB. Cannot be used for FileIn functions. + */ #define IS_DEVICE(path,errcode) \ do { \ struct stat statbuf; \ @@ -125,6 +138,7 @@ extern void reply (xdrproc_t xdrp, char *ret); /* Helper for functions which need either an absolute path in the * mounted filesystem, OR a /dev/ device which exists. + * NB. Cannot be used for FileIn functions. */ #define NEED_ROOT_OR_IS_DEVICE(path,errcode) \ do { \ @@ -147,7 +161,9 @@ extern void reply (xdrproc_t xdrp, char *ret); #define CHROOT_OUT \ do { int old_errno = errno; chroot ("."); errno = old_errno; } while (0) -/* Marks functions which are not implemented. */ +/* Marks functions which are not implemented. + * NB. Cannot be used for FileIn functions. + */ #define XXX_NOT_IMPL(errcode) \ do { \ reply_with_error ("%s: function not implemented", __func__); \