X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.h;h=609cbc29120f46831effb29c5a8d79661461f99c;hp=81066104ffad203bf7dc490b16f5d37c266f4752;hb=0003ea2c3dbaa7e22f4f616539136821d80694b8;hpb=3003df6bbc889c3939e6c478462dc4478d5b89f7

diff --git a/fish/fish.h b/fish/fish.h
index 8106610..609cbc2 100644
--- a/fish/fish.h
+++ b/fish/fish.h
@@ -55,6 +55,7 @@ extern int verbose;
 extern int command_num;
 extern int utf8_mode;
 extern int have_terminfo;
+extern int progress_bars;
 extern const char *libvirt_uri;
 extern int issue_command (const char *cmd, char *argv[], const char *pipe);
 extern void pod2text (const char *name, const char *shortdesc, const char *body);
@@ -87,40 +88,58 @@ extern int complete_dest_paths;
 extern char *complete_dest_paths_generator (const char *text, int state);
 
 /* in alloc.c */
-extern int do_alloc (const char *cmd, int argc, char *argv[]);
-extern int do_sparse (const char *cmd, int argc, char *argv[]);
+extern int run_alloc (const char *cmd, int argc, char *argv[]);
+extern int run_sparse (const char *cmd, int argc, char *argv[]);
 extern int alloc_disk (const char *filename, const char *size,
                        int add, int sparse);
+extern int parse_size (const char *str, off_t *size_rtn);
+
+/* in copy.c */
+extern int run_copy_in (const char *cmd, int argc, char *argv[]);
+extern int run_copy_out (const char *cmd, int argc, char *argv[]);
 
 /* in echo.c */
-extern int do_echo (const char *cmd, int argc, char *argv[]);
+extern int run_echo (const char *cmd, int argc, char *argv[]);
 
 /* in edit.c */
-extern int do_edit (const char *cmd, int argc, char *argv[]);
+extern int run_edit (const char *cmd, int argc, char *argv[]);
 
 /* in inspect.c */
 extern void inspect_mount (void);
 extern void print_inspect_prompt (void);
 
 /* in lcd.c */
-extern int do_lcd (const char *cmd, int argc, char *argv[]);
+extern int run_lcd (const char *cmd, int argc, char *argv[]);
 
 /* in glob.c */
-extern int do_glob (const char *cmd, int argc, char *argv[]);
+extern int run_glob (const char *cmd, int argc, char *argv[]);
 
 /* in man.c */
-extern int do_man (const char *cmd, int argc, char *argv[]);
+extern int run_man (const char *cmd, int argc, char *argv[]);
 
 /* in more.c */
-extern int do_more (const char *cmd, int argc, char *argv[]);
+extern int run_more (const char *cmd, int argc, char *argv[]);
 
 /* in prep.c */
+struct prep_data {
+  const struct prep *prep;
+  const char *orig_type_string;
+  const char **params;
+};
 typedef struct prep_data prep_data;
 extern void list_prepared_drives (void);
 extern prep_data *create_prepared_file (const char *type_string,
                                         const char *filename);
 extern void prepare_drive (const char *filename, prep_data *data,
                            const char *device);
+extern void prep_error (prep_data *data, const char *filename, const char *fs, ...) __attribute__((noreturn, format (printf,3,4)));
+
+/* in prep_lv.c */
+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);
 
 /* in rc.c (remote control) */
 extern void rc_listen (void) __attribute__((noreturn));
@@ -128,13 +147,13 @@ extern int rc_remote (int pid, const char *cmd, int argc, char *argv[],
                       int exit_on_error);
 
 /* in reopen.c */
-extern int do_reopen (const char *cmd, int argc, char *argv[]);
+extern int run_reopen (const char *cmd, int argc, char *argv[]);
 
 /* in supported.c */
-extern int do_supported (const char *cmd, int argc, char *argv[]);
+extern int run_supported (const char *cmd, int argc, char *argv[]);
 
 /* in time.c */
-extern int do_time (const char *cmd, int argc, char *argv[]);
+extern int run_time (const char *cmd, int argc, char *argv[]);
 
 /* in tilde.c */
 extern char *try_tilde_expansion (char *path);
@@ -147,18 +166,7 @@ extern int add_libvirt_drives (const char *guest);
  */
 #define BUILTIN_COMMANDS_FOR_COMPLETION \
   "help",				\
-  "quit", "exit", "q",		        \
-  "alloc", "allocate",		        \
-  "echo",				\
-  "edit", "vi", "emacs",		\
-  "lcd",				\
-  "glob",				\
-  "man", "manual",                      \
-  "more", "less",			\
-  "reopen",				\
-  "sparse",                             \
-  "supported",                          \
-  "time"
+  "quit", "exit", "q"
 
 static inline char *
 bad_cast (char const *s)