Fix non-srcdir builds: further fixes to OCaml build rules.

[libguestfs.git] / daemon / daemon.h

diff --git a/daemon/daemon.h b/daemon/daemon.h
index c3b9120..814d2b1 100644 (file)
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -51,8 +51,13 @@ 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;
 
+/*-- in names.c (auto-generated) --*/
+extern const char *function_names[];
+
 /*-- in proto.c --*/
 extern int proc_nr;
 extern int serial;
@@ -62,9 +67,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);
@@ -139,7 +144,13 @@ extern void reply (xdrproc_t xdrp, char *ret);
 
 /* Helper for functions which need either an absolute path in the
  * mounted filesystem, OR a /dev/ device which exists.
+ *
  * NB. Cannot be used for FileIn functions.
+ *
+ * NB #2: Functions which mix filenames and device paths should be
+ * avoided, and existing functions should be deprecated.  This is
+ * because we intend in future to make device parameters a distinct
+ * type from filenames.
  */
 #define NEED_ROOT_OR_IS_DEVICE(path,errcode) \
   do {                                                                 \
@@ -156,11 +167,22 @@ extern void reply (xdrproc_t xdrp, char *ret);
  * (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.
+ * (4) Neither macro affects errno.
  */
-#define CHROOT_IN chroot ("/sysroot");
-#define CHROOT_OUT \
-  do { int old_errno = errno; chroot ("."); errno = old_errno; } while (0)
+#define CHROOT_IN                              \
+  do {                                         \
+    int __old_errno = errno;                   \
+    if (chroot ("/sysroot") == -1)             \
+      perror ("CHROOT_IN: sysroot");           \
+    errno = __old_errno;                       \
+  } while (0)
+#define CHROOT_OUT                             \
+  do {                                         \
+    int __old_errno = errno;                   \
+    if (chroot (".") == -1)                    \
+      perror ("CHROOT_OUT: .");                        \
+    errno = __old_errno;                       \
+  } while (0)
 
 /* Marks functions which are not implemented.
  * NB. Cannot be used for FileIn functions.