X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdaemon.h;h=f08269046d7c6ba6c093042abe8268a7e41364d6;hp=0ce56e181dab909d6b9a563db4a31180978de75f;hb=d714547ab361962ca6f76ec07736f1515595b2df;hpb=82a5f441ccc8286885bcab082560207d50acfefd;ds=sidebyside

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 0ce56e1..f082690 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -36,8 +36,10 @@ extern int sysroot_len;
 
 extern char *sysroot_path (const char *path);
 
-extern int xwrite (int sock, const void *buf, size_t len);
-extern int xread (int sock, void *buf, size_t len);
+extern int xwrite (int sock, const void *buf, size_t len)
+  __attribute__((__warn_unused_result__));
+extern int xread (int sock, void *buf, size_t len)
+  __attribute__((__warn_unused_result__));
 
 extern int add_string (char ***argv, int *size, int *alloc, const char *str);
 extern int count_strings (char *const *argv);
@@ -45,12 +47,21 @@ extern void sort_strings (char **argv, int len);
 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 *argv);
-extern int commandrv (char **stdoutput, char **stderror,
-                      char const* const *argv);
+#define command(out,err,name,...) commandf((out),(err),0,(name),__VA_ARGS__)
+#define commandr(out,err,name,...) commandrf((out),(err),0,(name),__VA_ARGS__)
+#define commandv(out,err,argv) commandvf((out),(err),0,(argv))
+#define commandrv(out,err,argv) commandrvf((out),(err),0,(argv))
+
+#define COMMAND_FLAG_FOLD_STDOUT_ON_STDERR 1
+
+extern int commandf (char **stdoutput, char **stderror, int flags,
+		     const char *name, ...);
+extern int commandrf (char **stdoutput, char **stderror, int flags,
+		      const char *name, ...);
+extern int commandvf (char **stdoutput, char **stderror, int flags,
+		      char *const *argv);
+extern int commandrvf (char **stdoutput, char **stderror, int flags,
+		       char const* const *argv);
 
 extern char **split_lines (char *str);
 
@@ -116,7 +127,7 @@ extern void cancel_receive (void);
  * Note max write size if GUESTFS_MAX_CHUNK_SIZE.
  */
 extern int send_file_write (const void *buf, int len);
-extern void send_file_end (int cancel);
+extern int send_file_end (int cancel);
 
 /* only call this if there is a FileOut parameter */
 extern void reply (xdrproc_t xdrp, char *ret);