X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=9aa831a50e8ba0c6444d3b1d394a8134f779c7f9;hb=77b2275dfcebce16ceea17ddf77a7f9d0a41c082;hp=70f0beef9decbd640c8514dee05b0d2540e5a69f;hpb=3dfc0a8c5da8f3a4a6c13e936d4306b79b231dde;p=libguestfs.git

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 70f0bee..9aa831a 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);
 
@@ -47,11 +54,28 @@ extern int commandrv (char **stdoutput, char **stderror,
 
 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 int verbose;
+extern void udev_settle (void);
+
+/* 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;
@@ -62,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);
@@ -167,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)