X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.h;h=6f242da7b5d891f56c0ff99dbdbbf82d18756e5d;hp=da0c6a73156b85529801c56116e49a0263ec14f9;hb=4accf3197235300029d04d0ab637b66eaaf9f8df;hpb=4bcb267a248977c6b044e18a72266d665102de30

diff --git a/fish/fish.h b/fish/fish.h
index da0c6a7..6f242da 100644
--- a/fish/fish.h
+++ b/fish/fish.h
@@ -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));