diff options
Diffstat (limited to 'fish')
| -rw-r--r-- | fish/fish.c | 19 | ||||
| -rw-r--r-- | fish/fish.h | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/fish/fish.c b/fish/fish.c index 2022ee3a..bd13a827 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -73,6 +73,7 @@ int echo_commands = 0; int remote_control_listen = 0; int remote_control = 0; int exit_on_error = 1; +int command_num = 0; int launch (guestfs_h *_g) @@ -790,6 +791,9 @@ issue_command (const char *cmd, char *argv[], const char *pipecmd) int pid = 0; int i, r; + /* This counts the commands issued, starting at 1. */ + command_num++; + if (echo_commands) { printf ("%s", cmd); for (i = 0; argv[i] != NULL; ++i) @@ -1073,6 +1077,21 @@ display_builtin_command (const char *cmd) cmd); } +/* This is printed when the user types in an unknown command for the + * first command issued. A common case is the user doing: + * guestfish disk.img + * expecting guestfish to open 'disk.img' (in fact, this tried to + * run a command 'disk.img'). + */ +void +extended_help_message (void) +{ + fprintf (stderr, + _("Did you mean to open a disk image? guestfish -a disk.img\n" + "For a list of commands: guestfish -h\n" + "For complete documentation: man guestfish\n")); +} + void free_strings (char **argv) { diff --git a/fish/fish.h b/fish/fish.h index c4b1a459..06b8de5a 100644 --- a/fish/fish.h +++ b/fish/fish.h @@ -51,6 +51,7 @@ extern guestfs_h *g; extern int quit; extern int verbose; +extern int command_num; 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 void list_builtin_commands (void); @@ -64,6 +65,7 @@ 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 void extended_help_message (void); /* in cmds.c (auto-generated) */ extern void list_commands (void); |