X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.h;h=6f242da7b5d891f56c0ff99dbdbbf82d18756e5d;hp=be357f5d3a8a8cec215cfbf1923d39ab1cfba1b8;hb=dfb89e3556c02bcc5fbe62f90e3c716a2cbe93da;hpb=54837f6d7ba83178625e2f0c3c063457d9f3f79c

diff --git a/fish/fish.h b/fish/fish.h
index be357f5..6f242da 100644
--- a/fish/fish.h
+++ b/fish/fish.h
@@ -47,6 +47,11 @@
 #define STRCASENEQLEN(a,b,n) (strncasecmp((a),(b),(n)) != 0)
 #define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0)
 
+#define TMP_TEMPLATE_ON_STACK(var)                        \
+  const char *ttos_tmpdir = guestfs_tmpdir ();            \
+  char var[strlen (ttos_tmpdir) + 32];                    \
+  sprintf (var, "%s/guestfishXXXXXX", ttos_tmpdir)        \
+
 /* in fish.c */
 extern guestfs_h *g;
 extern int read_only;
@@ -56,9 +61,9 @@ 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;
-extern int issue_command (const char *cmd, char *argv[], const char *pipe);
-extern void pod2text (const char *name, const char *shortdesc, const char *body);
+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);
@@ -68,17 +73,16 @@ 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);
 extern void extended_help_message (void);
-extern char *read_key (const char *param);
 
 /* in cmds.c (auto-generated) */
 extern void list_commands (void);
 extern int display_command (const char *cmd);
-extern int run_action (const char *cmd, int argc, char *argv[]);
+extern int run_action (const char *cmd, size_t argc, char *argv[]);
 
 /* in completion.c (auto-generated) */
 extern char **do_completion (const char *text, int start, int end);
@@ -88,82 +92,88 @@ 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, 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 do_echo (const char *cmd, int argc, char *argv[]);
+extern int run_echo (const char *cmd, size_t argc, char *argv[]);
 
 /* in edit.c */
-extern int do_edit (const char *cmd, int argc, char *argv[]);
+extern int run_edit (const char *cmd, size_t argc, char *argv[]);
 
-/* in inspect.c */
-extern void inspect_mount (void);
-extern void print_inspect_prompt (void);
+/* 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 do_lcd (const char *cmd, int argc, char *argv[]);
+extern int run_lcd (const char *cmd, size_t argc, char *argv[]);
 
 /* in glob.c */
-extern int do_glob (const char *cmd, int argc, char *argv[]);
+extern int run_glob (const char *cmd, size_t argc, char *argv[]);
 
 /* in man.c */
-extern int do_man (const char *cmd, int argc, char *argv[]);
+extern int run_man (const char *cmd, size_t argc, char *argv[]);
 
 /* in more.c */
-extern int do_more (const char *cmd, int argc, char *argv[]);
+extern int run_more (const char *cmd, size_t argc, char *argv[]);
 
 /* in prep.c */
+struct prep_data {
+  const struct prep *prep;
+  const char *orig_type_string;
+  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)));
+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, 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));
-extern int rc_remote (int pid, const char *cmd, int argc, char *argv[],
+extern int rc_remote (int pid, const char *cmd, size_t 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, size_t argc, char *argv[]);
 
 /* in supported.c */
-extern int do_supported (const char *cmd, int argc, char *argv[]);
+extern int run_supported (const char *cmd, size_t argc, char *argv[]);
 
 /* in time.c */
-extern int do_time (const char *cmd, int argc, char *argv[]);
+extern int run_time (const char *cmd, size_t argc, char *argv[]);
 
 /* in tilde.c */
 extern char *try_tilde_expansion (char *path);
 
-/* in virt.c */
-extern int add_libvirt_drives (const char *guest);
-
 /* This should just list all the built-in commands so they can
  * be added to the generated auto-completion code.
  */
 #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)