X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.h;h=8c75a750a0add4d64a6d8dcb0610455a9b347ce3;hb=8ab2b85b2a67270b8cc5a91bb62a70c84cd6a02c;hp=6bcdb96de70afadbb0af6ac90d1af2fb4acbf757;hpb=319e946b92e175c05cdd1fdcb85c9b86f5631011;p=libguestfs.git

diff --git a/fish/fish.h b/fish/fish.h
index 6bcdb96..8c75a75 100644
--- a/fish/fish.h
+++ b/fish/fish.h
@@ -21,6 +21,8 @@
 
 #include <guestfs.h>
 
+#include "fish-cmds.h"
+
 #ifdef HAVE_GETTEXT
 #include "gettext.h"
 #define _(str) dgettext(PACKAGE, (str))
@@ -58,8 +60,6 @@ extern int read_only;
 extern int quit;
 extern int verbose;
 extern int command_num;
-extern int utf8_mode;
-extern int have_terminfo;
 extern int progress_bars;
 extern int remote_control_csh;
 extern const char *libvirt_uri;
@@ -80,6 +80,7 @@ extern char *file_in (const char *arg);
 extern void free_file_in (char *s);
 extern char *file_out (const char *arg);
 extern void extended_help_message (void);
+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 cmds.c (auto-generated) */
 extern void list_commands (void);
@@ -94,43 +95,13 @@ extern int complete_dest_paths;
 extern char *complete_dest_paths_generator (const char *text, int state);
 
 /* in alloc.c */
-extern int run_alloc (const char *cmd, size_t argc, char *argv[]);
-extern int run_sparse (const char *cmd, size_t 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, 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[]);
-
-/* in edit.c */
-extern int run_edit (const char *cmd, size_t argc, char *argv[]);
-
 /* in help.c */
 extern void display_help (void);
 
-/* in hexedit.c */
-extern int run_hexedit (const char *cmd, size_t argc, char *argv[]);
-
-/* in lcd.c */
-extern int run_lcd (const char *cmd, size_t argc, char *argv[]);
-
-/* in glob.c */
-extern int run_glob (const char *cmd, size_t argc, char *argv[]);
-
-/* in man.c */
-extern int run_man (const char *cmd, size_t argc, char *argv[]);
-
-/* in more.c */
-extern int run_more (const char *cmd, size_t argc, char *argv[]);
-
 /* in prep.c */
 struct prep_data {
   const struct prep *prep;
@@ -149,24 +120,11 @@ extern void free_prep_data (void *data);
 /* 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, 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));
 extern int rc_remote (int pid, const char *cmd, size_t argc, char *argv[],
                       int exit_on_error);
 
-/* in reopen.c */
-extern int run_reopen (const char *cmd, size_t argc, char *argv[]);
-
-/* in supported.c */
-extern int run_supported (const char *cmd, size_t argc, char *argv[]);
-
-/* in time.c */
-extern int run_time (const char *cmd, size_t argc, char *argv[]);
-
 /* in tilde.c */
 extern char *try_tilde_expansion (char *path);