From 0003ea2c3dbaa7e22f4f616539136821d80694b8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 18 Sep 2010 09:38:05 +0100
Subject: generator: Generate guestfish-only commands.

The guestfish-only commands such as 'alloc' and 'edit' are
now generated from one place in the generator instead of being
spread around ad-hoc in the C code.
---
 fish/fish.h | 40 ++++++++++++++--------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

(limited to 'fish/fish.h')

diff --git a/fish/fish.h b/fish/fish.h
index f908a222..609cbc29 100644
--- a/fish/fish.h
+++ b/fish/fish.h
@@ -88,37 +88,37 @@ 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 do_copy_in (const char *cmd, int argc, char *argv[]);
-extern int do_copy_out (const char *cmd, int argc, char *argv[]);
+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 {
@@ -147,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);
@@ -166,19 +166,7 @@ extern int add_libvirt_drives (const char *guest);
  */
 #define BUILTIN_COMMANDS_FOR_COMPLETION \
   "help",				\
-  "quit", "exit", "q",		        \
-  "alloc", "allocate",		        \
-  "copy-in", "copy-out",                \
-  "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)
-- 
cgit