X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=pscp.c;h=9259dd084d1ac0f4d6176f15957709a1ff4f1e5b;hb=df913d00360aea784521662ad42c11e3933bb6f8;hp=d0e045f9072edd31274c03a3b33a704577f252c8;hpb=6daf6faede46bd8aa3a39cbe59d34c987b2ea114;p=PuTTY.git

diff --git a/pscp.c b/pscp.c
index d0e045f9..9259dd08 100644
--- a/pscp.c
+++ b/pscp.c
@@ -1827,7 +1827,7 @@ static void sink(char *targ, char *src)
 		    tell_user(stderr, "         when we requested a file "
 			      "called '%s'.", stripsrc);
 		    tell_user(stderr, "         If this is a wildcard, "
-			      "consider upgrading to SSH 2 or using");
+			      "consider upgrading to SSH-2 or using");
 		    tell_user(stderr, "         the '-unsafe' option. Renaming"
 			      " of this file has been disallowed.");
 		    /* Override the name the server provided with our own. */
@@ -2139,6 +2139,8 @@ static void usage(void)
 	("       pscp [options] source [source...] [user@]host:target\n");
     printf("       pscp [options] -ls [user@]host:filespec\n");
     printf("Options:\n");
+    printf("  -V        print version information and exit\n");
+    printf("  -pgpfp    print PGP key fingerprints and exit\n");
     printf("  -p        preserve file attributes\n");
     printf("  -q        quiet, don't show statistics\n");
     printf("  -r        copy directories recursively\n");
@@ -2153,7 +2155,6 @@ static void usage(void)
     printf("  -i key    private key file for authentication\n");
     printf("  -batch    disable all interactive prompts\n");
     printf("  -unsafe   allow server-side wildcards (DANGEROUS)\n");
-    printf("  -V        print version information\n");
     printf("  -sftp     force use of SFTP protocol\n");
     printf("  -scp      force use of SCP protocol\n");
 #if 0
@@ -2223,6 +2224,9 @@ int psftp_main(int argc, char *argv[])
 	    /* We have our own verbosity in addition to `flags'. */
 	    if (flags & FLAG_VERBOSE)
 		verbose = 1;
+        } else if (strcmp(argv[i], "-pgpfp") == 0) {
+            pgp_fingerprints();
+            return 1;
 	} else if (strcmp(argv[i], "-r") == 0) {
 	    recursive = 1;
 	} else if (strcmp(argv[i], "-p") == 0) {