X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.c;h=bd13a827dbc12c341a6b3a2fc02dfc8a17086a9b;hb=07f4b20ae959069fca41756b0dc103ec5fa99754;hp=2022ee3ada8098aaf8e1bbf3f30719e4b9bfd4c8;hpb=9e397cc16be51f4f3940c7a5b90d0bc43f3f13a8;p=libguestfs.git

diff --git a/fish/fish.c b/fish/fish.c
index 2022ee3..bd13a82 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)
 {