X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=e2b6a2a39c3bd0205fff48079969eb042904ce69;hb=c989e8832df70b4cb8200ba8d5622048e560f1f7;hp=fa896e17f044487c3e2b17f33ca9b78bc0044c5c;hpb=99bd425a0a8fb02c27e0c22b32dafa804773a7b1;p=libguestfs.git

diff --git a/daemon/daemon.h b/daemon/daemon.h
index fa896e1..e2b6a2a 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -19,6 +19,8 @@
 #ifndef GUESTFSD_DAEMON_H
 #define GUESTFSD_DAEMON_H
 
+#include "../src/guestfs_protocol.h"
+
 #include <stdarg.h>
 #include <rpc/types.h>
 #include <rpc/xdr.h>
@@ -26,6 +28,13 @@
 /* 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 add_string (char ***argv, int *size, int *alloc, const char *str);
+extern int count_strings (char **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, ...);
 
 /* in proto.c */
@@ -37,6 +46,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);
@@ -44,15 +56,23 @@ extern void reply_with_error (const char *fs, ...);
 extern void reply_with_perror (const char *fs, ...);
 extern void reply (xdrproc_t xdrp, char *ret);
 
-#define NEED_ROOT							\
+#define NEED_ROOT(errcode)						\
   do {									\
     if (!root_mounted) {						\
       reply_with_error ("%s: you must call 'mount' first to mount the root filesystem", __func__); \
-      return -1;							\
+      return (errcode);							\
     }									\
   }									\
   while (0)
 
+#define ABS_PATH(path,errcode)						\
+  do {									\
+    if ((path)[0] != '/') {						\
+      reply_with_error ("%s: path must start with a / character", __func__); \
+      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