X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdaemon.h;h=86c68769f4b808a4cf397a61b708dfa2a43bea4a;hp=001c7038d04b8f924decea316df199fbb52d9a51;hb=abac360f324d8c881878c5d9b7fb64be93981125;hpb=0703248d233744047515418893dac05ce013a642 diff --git a/daemon/daemon.h b/daemon/daemon.h index 001c703..86c6876 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -22,8 +22,6 @@ #include #include #include -#include -#include #include #include @@ -31,11 +29,20 @@ #include "../src/guestfs_protocol.h" /*-- in guestfsd.c --*/ -extern int xwrite (int sock, const void *buf, size_t len); -extern int xread (int sock, void *buf, size_t len); +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) + __attribute__((__warn_unused_result__)); +extern int xread (int sock, void *buf, size_t len) + __attribute__((__warn_unused_result__)); extern int add_string (char ***argv, int *size, int *alloc, const char *str); -extern int count_strings (char * const* const argv); +extern int count_strings (char *const *argv); extern void sort_strings (char **argv, int len); extern void free_strings (char **argv); extern void free_stringslen (char **argv, int len); @@ -43,13 +50,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 *argv); extern int commandrv (char **stdoutput, char **stderror, - char * const* const argv); + char const* const *argv); -extern int shell_quote (char *out, int len, const char *in); +extern char **split_lines (char *str); -extern int verbose; +extern int device_name_translation (char *device, const char *func); + +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; @@ -60,12 +88,12 @@ 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); +extern void main_loop (int sock) __attribute__((noreturn)); /* ordinary daemon functions use these to indicate errors */ extern void reply_with_error (const char *fs, ...) @@ -90,7 +118,7 @@ extern void cancel_receive (void); * Note max write size if GUESTFS_MAX_CHUNK_SIZE. */ extern int send_file_write (const void *buf, int len); -extern void send_file_end (int cancel); +extern int send_file_end (int cancel); /* only call this if there is a FileOut parameter */ extern void reply (xdrproc_t xdrp, char *ret); @@ -98,11 +126,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) @@ -110,41 +138,48 @@ 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) -/* 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) \ +#define RESOLVE_DEVICE(path,fail_stmt) \ 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)); \ - return (errcode); \ + fail_stmt; \ } \ + if (device_name_translation ((path), __func__) == -1) \ + fail_stmt; \ } 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) \ +#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) @@ -153,11 +188,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. @@ -169,4 +215,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 */