fish: Update copyright dates in usage message.

[libguestfs.git] / fish / fish.c

diff --git a/fish/fish.c b/fish/fish.c
index 6433942..e8c0b60 100644 (file)
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -26,7 +26,6 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <signal.h>
-#include <assert.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <locale.h>
@@ -114,7 +113,7 @@ usage (int status)
     fprintf (stdout,
            _("%s: guest filesystem shell\n"
              "%s lets you edit virtual machine filesystems\n"
-             "Copyright (C) 2009 Red Hat Inc.\n"
+             "Copyright (C) 2009-2010 Red Hat Inc.\n"
              "Usage:\n"
              "  %s [--options] cmd [: cmd : cmd ...]\n"
              "  %s -i libvirt-domain\n"
@@ -148,7 +147,7 @@ usage (int status)
              "  -v|--verbose         Verbose messages\n"
              "  -x                   Echo each command before executing it\n"
              "  -V|--version         Display version and exit\n"
-             "For more information,  see the manpage %s(1).\n"),
+             "For more information, see the manpage %s(1).\n"),
              program_name, program_name, program_name,
              program_name, program_name, program_name,
              program_name, program_name, program_name);
@@ -1061,6 +1060,12 @@ issue_command (const char *cmd, char *argv[], const char *pipecmd)
   else if (STRCASEEQ (cmd, "alloc") ||
            STRCASEEQ (cmd, "allocate"))
     r = do_alloc (cmd, argc, argv);
+  else if (STRCASEEQ (cmd, "copy-in") ||
+           STRCASEEQ (cmd, "copy_in"))
+    r = do_copy_in (cmd, argc, argv);
+  else if (STRCASEEQ (cmd, "copy-out") ||
+           STRCASEEQ (cmd, "copy_out"))
+    r = do_copy_out (cmd, argc, argv);
   else if (STRCASEEQ (cmd, "echo"))
     r = do_echo (cmd, argc, argv);
   else if (STRCASEEQ (cmd, "edit") ||
@@ -1126,6 +1131,10 @@ list_builtin_commands (void)
   printf ("%-20s %s\n",
           "alloc", _("allocate an image"));
   printf ("%-20s %s\n",
+          "copy-in", _("copy files into an image"));
+  printf ("%-20s %s\n",
+          "copy-out", _("copy files out of an image"));
+  printf ("%-20s %s\n",
           "echo", _("display a line of text"));
   printf ("%-20s %s\n",
           "edit", _("edit a file in the image"));
@@ -1166,6 +1175,26 @@ display_builtin_command (const char *cmd)
               ));
     return 0;
   }
+  else if (STRCASEEQ (cmd, "copy-in") ||
+           STRCASEEQ (cmd, "copy_in")) {
+    printf (_("copy-in - copy files into an image\n"
+              "     copy-in <local> [<local> ...] <remotedir>\n"
+              "\n"
+              "    Copy local files or directories recursively into the\n"
+              "    image, placing them on a remote directory.\n"
+              ));
+    return 0;
+  }
+  else if (STRCASEEQ (cmd, "copy-out") ||
+           STRCASEEQ (cmd, "copy_out")) {
+    printf (_("copy-out - copy files out of an image\n"
+              "     copy-out <remote> [<remote> ...] <localdir>\n"
+              "\n"
+              "    Copy remote files or directories recursively out of the\n"
+              "    image, placing them in a local directory.\n"
+              ));
+    return 0;
+  }
   else if (STRCASEEQ (cmd, "echo")) {
     printf (_("echo - display a line of text\n"
               "     echo [<params> ...]\n"