X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.h;h=b94277de1314da1403cbd4922b486477d1ae0741;hp=f6e1aeb94a8c2603212fbaccc2bae29ca6c515b7;hb=d600342b7d29c0176ff96a7807ebb38303ecb3a6;hpb=8ea62c8d7f3f7f7e4057b93105cf979271aa13f4

diff --git a/fish/fish.h b/fish/fish.h
index f6e1aeb..b94277d 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;
@@ -78,7 +83,7 @@ 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,37 +93,40 @@ 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, int argc, char *argv[]);
-extern int run_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, int argc, char *argv[]);
-extern int run_copy_out (const char *cmd, int argc, char *argv[]);
+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 echo.c */
-extern int run_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 run_edit (const char *cmd, int argc, char *argv[]);
+extern int run_edit (const char *cmd, size_t argc, char *argv[]);
+
+/* in hexedit.c */
+extern int run_hexedit (const char *cmd, size_t argc, char *argv[]);
 
 /* in inspect.c */
 extern void inspect_mount (void);
 extern void print_inspect_prompt (void);
 
 /* in lcd.c */
-extern int run_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 run_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 run_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 run_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 {
@@ -144,17 +152,17 @@ extern void progress_callback (guestfs_h *g, void *data, int proc_nr, int serial
 
 /* 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 run_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 run_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 run_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);