Unix 'puttygen --help' was a mess.

Bring it into line with the other PuTTY tools: --help goes to stdout,
has a one-line purpose and brief version information, --version ends
with a newline.

(Also, tweak text bring the help message under 80 columns.)

diff --git a/cmdgen.c b/cmdgen.c
index d6c1f72115ac3080b17e7750aa1ee15350637e08..f9332b5af0e7dcee1a2b2cbc222261199816bbd3 100644 (file)
--- a/cmdgen.c
+++ b/cmdgen.c
@@ -130,13 +130,13 @@ void sk_cleanup(void)
 void showversion(void)
 {
     char *buildinfo_text = buildinfo("\n");
-    printf("puttygen: %s\n%s", ver, buildinfo_text);
+    printf("puttygen: %s\n%s\n", ver, buildinfo_text);
     sfree(buildinfo_text);
 }
 
 void usage(int standalone)
 {
-    fprintf(stderr,
+    fprintf(standalone ? stderr : stdout,
            "Usage: puttygen ( keyfile | -t type [ -b bits ] )\n"
            "                [ -C comment ] [ -P ] [ -q ]\n"
            "                [ -o output-keyfile ] [ -O type | -l | -L"
@@ -152,35 +152,35 @@ void help(void)
      * Help message is an extended version of the usage message. So
      * start with that, plus a version heading.
      */
-    showversion();
+    printf("PuTTYgen: key generator and converter for the PuTTY tools\n"
+          "%s\n", ver);
     usage(FALSE);
-    fprintf(stderr,
-           "  -t    specify key type when generating (ed25519, ecdsa, rsa, "
+    printf("  -t    specify key type when generating (ed25519, ecdsa, rsa, "
                                                        "dsa, rsa1)\n"
-           "  -b    specify number of bits when generating key\n"
-           "  -C    change or specify key comment\n"
-           "  -P    change key passphrase\n"
-           "  -q    quiet: do not display progress bar\n"
-           "  -O    specify output type:\n"
-           "           private             output PuTTY private key format\n"
-           "           private-openssh     export OpenSSH private key\n"
-           "           private-openssh-new export OpenSSH private key "
-                                             "(force new file format)\n"
-           "           private-sshcom      export ssh.com private key\n"
-           "           public              RFC 4716 / ssh.com public key\n"
-           "           public-openssh      OpenSSH public key\n"
-           "           fingerprint         output the key fingerprint\n"
-           "  -o    specify output file\n"
-           "  -l    equivalent to `-O fingerprint'\n"
-           "  -L    equivalent to `-O public-openssh'\n"
-           "  -p    equivalent to `-O public'\n"
-           "  --old-passphrase file\n"
-           "        specify file containing old key passphrase\n"
-           "  --new-passphrase file\n"
-           "        specify file containing new key passphrase\n"
-           "  --random-device device\n"
-           "        specify device to read entropy from (e.g. /dev/urandom)\n"
-           );
+          "  -b    specify number of bits when generating key\n"
+          "  -C    change or specify key comment\n"
+          "  -P    change key passphrase\n"
+          "  -q    quiet: do not display progress bar\n"
+          "  -O    specify output type:\n"
+          "           private             output PuTTY private key format\n"
+          "           private-openssh     export OpenSSH private key\n"
+          "           private-openssh-new export OpenSSH private key "
+                                             "(force new format)\n"
+          "           private-sshcom      export ssh.com private key\n"
+          "           public              RFC 4716 / ssh.com public key\n"
+          "           public-openssh      OpenSSH public key\n"
+          "           fingerprint         output the key fingerprint\n"
+          "  -o    specify output file\n"
+          "  -l    equivalent to `-O fingerprint'\n"
+          "  -L    equivalent to `-O public-openssh'\n"
+          "  -p    equivalent to `-O public'\n"
+          "  --old-passphrase file\n"
+          "        specify file containing old key passphrase\n"
+          "  --new-passphrase file\n"
+          "        specify file containing new key passphrase\n"
+          "  --random-device device\n"
+          "        specify device to read entropy from (e.g. /dev/urandom)\n"
+          );
 }
 
 static int move(char *from, char *to)