X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.h;h=6f242da7b5d891f56c0ff99dbdbbf82d18756e5d;hb=70daccfe4e9939078436c2830928d8e53432dd84;hp=f4b6c9cbe4c7e65496306a59dacec5846bc9389a;hpb=272b754093ef824486993540a893d39be8e7e9f0;p=libguestfs.git diff --git a/fish/fish.h b/fish/fish.h index f4b6c9c..6f242da 100644 --- a/fish/fish.h +++ b/fish/fish.h @@ -63,7 +63,7 @@ extern int have_terminfo; extern int progress_bars; extern int remote_control_csh; extern const char *libvirt_uri; -extern int issue_command (const char *cmd, char *argv[], const char *pipe); +extern int issue_command (const char *cmd, char *argv[], const char *pipe, int rc_exit_on_error_flag); extern void list_builtin_commands (void); extern int display_builtin_command (const char *cmd); extern void free_strings (char **argv); @@ -73,7 +73,7 @@ extern void print_table (char *const *argv); extern int is_true (const char *str); extern char **parse_string_list (const char *str); extern int xwrite (int fd, const void *buf, size_t len); -extern char *resolve_win_path (const char *path); +extern char *win_prefix (const char *path); extern char *file_in (const char *arg); extern void free_file_in (char *s); extern char *file_out (const char *arg); @@ -102,6 +102,9 @@ extern int parse_size (const char *str, off_t *size_rtn); extern int run_copy_in (const char *cmd, size_t argc, char *argv[]); extern int run_copy_out (const char *cmd, size_t argc, char *argv[]); +/* in display.c */ +extern int run_display (const char *cmd, size_t argc, char *argv[]); + /* in echo.c */ extern int run_echo (const char *cmd, size_t argc, char *argv[]); @@ -146,7 +149,7 @@ extern int vg_lv_parse (const char *device, char **vg, char **lv); /* in progress.c */ extern void reset_progress_bar (void); -extern void progress_callback (guestfs_h *g, void *data, int proc_nr, int serial, uint64_t position, uint64_t total); +extern void progress_callback (guestfs_h *g, void *data, uint64_t event, int event_handle, int flags, const char *buf, size_t buf_len, const uint64_t *array, size_t array_len); /* in rc.c (remote control) */ extern void rc_listen (void) __attribute__((noreturn));