Fix: '-D' was not recognized as a parameter to guestfish.

[libguestfs.git] / fish / fish.c

diff --git a/fish/fish.c b/fish/fish.c
index 59348c3..132b59e 100644 (file)
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -1,5 +1,5 @@
 /* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@ usage (void)
 int
 main (int argc, char *argv[])
 {
-  static const char *options = "a:f:h::im:nrv?V";
+  static const char *options = "a:Df:h::im:nrv?V";
   static struct option long_options[] = {
     { "add", 1, 0, 'a' },
     { "cmd-help", 2, 0, 'h' },
@@ -727,13 +727,19 @@ issue_command (const char *cmd, char *argv[], const char *pipecmd)
   else if (strcasecmp (cmd, "more") == 0 ||
           strcasecmp (cmd, "less") == 0)
     r = do_more (cmd, argc, argv);
+  else if (strcasecmp (cmd, "reopen") == 0)
+    r = do_reopen (cmd, argc, argv);
   else if (strcasecmp (cmd, "time") == 0)
     r = do_time (cmd, argc, argv);
   else
     r = run_action (cmd, argc, argv);
 
+  /* Always flush stdout after every command, so that messages, results
+   * etc appear immediately.
+   */
+  fflush (stdout);
+
   if (pipecmd) {
-    fflush (stdout);
     close (1);
     dup2 (stdout_saved_fd, 1);
     close (stdout_saved_fd);
@@ -763,6 +769,10 @@ list_builtin_commands (void)
   printf ("%-20s %s\n",
          "glob", _("expand wildcards in command"));
   printf ("%-20s %s\n",
+         "more", _("view a file in the pager"));
+  printf ("%-20s %s\n",
+         "reopen", _("close and reopen libguestfs handle"));
+  printf ("%-20s %s\n",
          "time", _("measure time taken to run command"));
 
   /* actions are printed after this (see list_commands) */
@@ -825,6 +835,10 @@ display_builtin_command (const char *cmd)
              "    Glob runs <command> with wildcards expanded in any\n"
              "    command args.  Note that the command is run repeatedly\n"
              "    once for each expanded argument.\n"));
+  else if (strcasecmp (cmd, "help") == 0)
+    printf (_("help - display a list of commands or help on a command\n"
+             "     help cmd\n"
+             "     help\n"));
   else if (strcasecmp (cmd, "more") == 0 ||
           strcasecmp (cmd, "less") == 0)
     printf (_("more - view a file in the pager\n"
@@ -840,15 +854,18 @@ display_builtin_command (const char *cmd)
              "\n"
              "    NOTE: This will not work reliably for large files\n"
              "    (> 2 MB) or binary files containing \\0 bytes.\n"));
-  else if (strcasecmp (cmd, "help") == 0)
-    printf (_("help - display a list of commands or help on a command\n"
-             "     help cmd\n"
-             "     help\n"));
   else if (strcasecmp (cmd, "quit") == 0 ||
           strcasecmp (cmd, "exit") == 0 ||
           strcasecmp (cmd, "q") == 0)
     printf (_("quit - quit guestfish\n"
              "     quit\n"));
+  else if (strcasecmp (cmd, "reopen") == 0)
+    printf (_("reopen - close and reopen the libguestfs handle\n"
+             "     reopen\n"
+             "\n"
+             "Close and reopen the libguestfs handle.  It is not necessary to use\n"
+             "this normally, because the handle is closed properly when guestfish\n"
+             "exits.  However this is occasionally useful for testing.\n"));
   else if (strcasecmp (cmd, "time") == 0)
     printf (_("time - measure time taken to run command\n"
              "    time <command> [<args> ...]\n"