X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=27d86c9b46d818315abee47cf3abf95893904ef6;hb=e038597ebd1e43c83a8ddde21c4f1898eb7a9a98;hp=60e1982b86ad66c9a52c99722e92dc81b87ffdfd;hpb=8e570870f577ff0c3db074f88924633b559af5d4;p=libguestfs.git

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 60e1982..27d86c9 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -20,20 +20,29 @@
 #define GUESTFSD_DAEMON_H
 
 #include <stdarg.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
+#include "../src/guestfs_protocol.h"
+
 /* in guestfsd.c */
-extern void xwrite (int sock, const void *buf, size_t len);
-extern void xread (int sock, void *buf, size_t len);
+extern int xwrite (int sock, const void *buf, size_t len);
+extern int xread (int sock, void *buf, size_t len);
 
 extern int add_string (char ***argv, int *size, int *alloc, const char *str);
-extern int count_strings (char **argv);
+extern int count_strings (char * const* const argv);
 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 commandv (char **stdoutput, char **stderror,
+		     char * const* const argv);
 
 /* in proto.c */
 extern int proc_nr;
@@ -44,6 +53,9 @@ extern int root_mounted;
 
 /* in stubs.c (auto-generated) */
 extern void dispatch_incoming_message (XDR *);
+extern guestfs_lvm_int_pv_list *parse_command_line_pvs (void);
+extern guestfs_lvm_int_vg_list *parse_command_line_vgs (void);
+extern guestfs_lvm_int_lv_list *parse_command_line_lvs (void);
 
 /* in proto.c */
 extern void main_loop (int sock);
@@ -68,13 +80,35 @@ extern void reply (xdrproc_t xdrp, char *ret);
     }									\
   } while (0)
 
+#define IS_DEVICE(path,errcode)						\
+  do {									\
+    struct stat statbuf;						\
+    if (strncmp ((path), "/dev/", 5) != 0) {				\
+      reply_with_error ("%s: %s: expecting a device name", __func__, (path)); \
+      return (errcode);							\
+    }									\
+    if (stat ((path), &statbuf) == -1) {				\
+      reply_with_perror ("%s: %s", __func__, (path));			\
+      return (errcode);							\
+    }									\
+  } while (0)
+
 /* NB:
  * (1) You must match CHROOT_IN and CHROOT_OUT even along error paths.
  * (2) You must not change directory!  cwd must always be "/", otherwise
  *     we can't escape our own chroot.
  * (3) All paths specified must be absolute.
+ * (4) CHROOT_OUT does not affect errno.
  */
 #define CHROOT_IN chroot ("/sysroot");
-#define CHROOT_OUT chroot (".");
+#define CHROOT_OUT \
+  do { int old_errno = errno; chroot ("."); errno = old_errno; } while (0)
+
+#define XXX_NOT_IMPL(errcode)						\
+  do {									\
+    reply_with_error ("%s: function not implemented", __func__);	\
+    return (errcode);							\
+  }									\
+  while (0)
 
 #endif /* GUESTFSD_DAEMON_H */