X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdaemon.h;h=814d2b18f046c1ac0a40d22e37d9f112ede3439d;hp=331fc0dfbba8884c5f362c46520f7c7ed9aaf961;hb=d5532e9ad29b28c2b323ad0abe4e0caa6e03f675;hpb=e2870fb94cbd22affecdd16e8f75f75e78d1c18b

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 331fc0d..814d2b1 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -22,8 +22,6 @@
 #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>
@@ -41,13 +39,25 @@ 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 commandr (char **stdoutput, char **stderror, const char *name, ...);
 extern int commandv (char **stdoutput, char **stderror,
 		     char * const* const argv);
+extern int commandrv (char **stdoutput, char **stderror,
+		      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;
 
+/*-- in names.c (auto-generated) --*/
+extern const char *function_names[];
+
 /*-- in proto.c --*/
 extern int proc_nr;
 extern int serial;
@@ -57,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);
@@ -92,14 +102,6 @@ extern void send_file_end (int cancel);
 /* only call this if there is a FileOut parameter */
 extern void reply (xdrproc_t xdrp, char *ret);
 
-/* Append to existing string.  If existing string is NULL then
- * this creates a new string.  This uses an "interesting" variation
- * of asprintf.
- */
-
-#define catprintf(strp,fs,...) \
-  asprintf ((strp), "%s" fs, *(strp) ? *(strp) : "", __VA_ARGS__)
-
 /* Helper for functions that need a root filesystem mounted.
  * NB. Cannot be used for FileIn functions.
  */
@@ -123,25 +125,32 @@ extern void reply (xdrproc_t xdrp, char *ret);
     }									\
   } while (0)
 
-/* Helper for functions that need an argument ("path") that is a device.
+/* All functions that need an argument that is a device or partition name
+ * must call this macro.  It checks that the device exists and does
+ * device name translation (described in the guestfs(3) manpage).
+ * Note that the "path" argument may be modified.
+ *
  * NB. Cannot be used for FileIn functions.
  */
 #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));			\
+    if (device_name_translation ((path), __func__) == -1)		\
       return (errcode);							\
-    }									\
   } while (0)
 
 /* 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 {									\
@@ -158,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.