X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdaemon.h;h=cbcab639621700413278c2b7eae495023ff69d04;hp=553973d9d19fe603d4606859e0734ce81adee16c;hb=a4d2e6df0bbbd7dc9e5bf400e4e35efec0a18ff0;hpb=99e28249d52ca5495b636e14ae3e4387ee62c8fe

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 553973d..cbcab63 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -29,6 +29,13 @@
 #include "../src/guestfs_protocol.h"
 
 /*-- in guestfsd.c --*/
+extern int verbose;
+
+extern const char *sysroot;
+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);
 
@@ -41,19 +48,34 @@ 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);
+                     char * const* const argv);
 extern int commandrv (char **stdoutput, char **stderror,
-		      char * const* const argv);
+                      char * const* const argv);
 
 extern char **split_lines (char *str);
 
-extern int shell_quote (char *out, int len, const char *in);
-
 extern int device_name_translation (char *device, const char *func);
 
 extern void udev_settle (void);
 
-extern int verbose;
+/* This just stops gcc from giving a warning about our custom
+ * printf formatters %Q and %R.  See HACKING file for more
+ * info about these.
+ */
+static inline int
+asprintf_nowarn (char **strp, const char *fmt, ...)
+{
+  int r;
+  va_list args;
+
+  va_start (args, fmt);
+  r = vasprintf (strp, fmt, args);
+  va_end (args);
+  return r;
+}
+
+/*-- in names.c (auto-generated) --*/
+extern const char *function_names[];
 
 /*-- in proto.c --*/
 extern int proc_nr;
@@ -64,9 +86,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);
+extern guestfs_int_lvm_pv_list *parse_command_line_pvs (void);
+extern guestfs_int_lvm_vg_list *parse_command_line_vgs (void);
+extern guestfs_int_lvm_lv_list *parse_command_line_lvs (void);
 
 /*-- in proto.c --*/
 extern void main_loop (int sock);
@@ -102,11 +124,11 @@ extern void reply (xdrproc_t xdrp, char *ret);
 /* Helper for functions that need a root filesystem mounted.
  * NB. Cannot be used for FileIn functions.
  */
-#define NEED_ROOT(errcode)						\
+#define NEED_ROOT(fail_stmt)						\
   do {									\
     if (!root_mounted) {						\
       reply_with_error ("%s: you must call 'mount' first to mount the root filesystem", __func__); \
-      return (errcode);							\
+      fail_stmt;							\
     }									\
   }									\
   while (0)
@@ -114,11 +136,11 @@ extern void reply (xdrproc_t xdrp, char *ret);
 /* Helper for functions that need an argument ("path") that is absolute.
  * NB. Cannot be used for FileIn functions.
  */
-#define ABS_PATH(path,errcode)						\
+#define ABS_PATH(path,fail_stmt)					\
   do {									\
     if ((path)[0] != '/') {						\
       reply_with_error ("%s: path must start with a / character", __func__); \
-      return (errcode);							\
+      fail_stmt;							\
     }									\
   } while (0)
 
@@ -129,14 +151,14 @@ extern void reply (xdrproc_t xdrp, char *ret);
  *
  * NB. Cannot be used for FileIn functions.
  */
-#define IS_DEVICE(path,errcode)						\
+#define RESOLVE_DEVICE(path,fail_stmt)					\
   do {									\
     if (strncmp ((path), "/dev/", 5) != 0) {				\
       reply_with_error ("%s: %s: expecting a device name", __func__, (path)); \
-      return (errcode);							\
+      fail_stmt;							\
     }									\
     if (device_name_translation ((path), __func__) == -1)		\
-      return (errcode);							\
+      fail_stmt;							\
   } while (0)
 
 /* Helper for functions which need either an absolute path in the
@@ -149,13 +171,13 @@ extern void reply (xdrproc_t xdrp, char *ret);
  * because we intend in future to make device parameters a distinct
  * type from filenames.
  */
-#define NEED_ROOT_OR_IS_DEVICE(path,errcode) \
+#define REQUIRE_ROOT_OR_RESOLVE_DEVICE(path,fail_stmt)			\
   do {									\
     if (strncmp ((path), "/dev/", 5) == 0)				\
-      IS_DEVICE ((path),(errcode));					\
+      RESOLVE_DEVICE ((path), fail_stmt);				\
     else {								\
-      NEED_ROOT ((errcode));						\
-      ABS_PATH ((path),(errcode));					\
+      NEED_ROOT (fail_stmt);						\
+      ABS_PATH ((path),fail_stmt);					\
     }									\
   } while (0)
 
@@ -169,7 +191,7 @@ extern void reply (xdrproc_t xdrp, char *ret);
 #define CHROOT_IN				\
   do {						\
     int __old_errno = errno;			\
-    if (chroot ("/sysroot") == -1)		\
+    if (chroot (sysroot) == -1)			\
       perror ("CHROOT_IN: sysroot");		\
     errno = __old_errno;			\
   } while (0)
@@ -191,4 +213,14 @@ extern void reply (xdrproc_t xdrp, char *ret);
   }									\
   while (0)
 
+#ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
+#  define __attribute__(x) /* empty */
+# endif
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif
+
 #endif /* GUESTFSD_DAEMON_H */