X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=cat%2Fvirt-cat.c;h=ebae8952216af9ff7fc9a08ef262b1d804f42762;hp=3510a94861809eafbee9a830b4991d78c9dafdb3;hb=b875f8e115842b37e6c7c9e59cb263a1cbb334aa;hpb=3bd883f344a5d6f155f7252e8a478d5b7935d7c6;ds=sidebyside

diff --git a/cat/virt-cat.c b/cat/virt-cat.c
index 3510a94..ebae895 100644
--- a/cat/virt-cat.c
+++ b/cat/virt-cat.c
@@ -69,7 +69,7 @@ usage (int status)
              "  --keys-from-stdin    Read passphrases from stdin\n"
              "  -v|--verbose         Verbose messages\n"
              "  -V|--version         Display version and exit\n"
-             "  -x                   Echo each command before executing it\n"
+             "  -x                   Trace libguestfs API calls\n"
              "For more information, see the manpage %s(1).\n"),
              program_name, program_name, program_name,
              program_name);
@@ -237,13 +237,15 @@ main (int argc, char *argv[])
   /* Free up data structures, no longer needed after this point. */
   free_drives (drvs);
 
+  unsigned errors = 0;
+
   while (optind < argc) {
     if (guestfs_download (g, argv[optind], "/dev/stdout") == -1)
-      exit (EXIT_FAILURE);
+      errors++;
     optind++;
   }
 
   guestfs_close (g);
 
-  exit (EXIT_SUCCESS);
+  exit (errors == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }