Update man pages to reflect new usage method.

7 files changed, 36 insertions, 19 deletions

diff --git a/lib/libkeynote/keynote-keygen.1 b/lib/libkeynote/keynote-keygen.1
index aa97695298a..df9b021490a 100644
--- a/lib/libkeynote/keynote-keygen.1
+++ b/lib/libkeynote/keynote-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote-keygen.1,v 1.1 1999/05/23 22:32:07 angelos Exp $
+.\" $OpenBSD: keynote-keygen.1,v 1.2 1999/05/24 01:50:03 angelos Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -28,7 +28,7 @@
 .Nm keynote-keygen
 .Nd command line tool for generating public/private keys
 .Sh SYNOPSIS
-.Nm keynote-keygen
+.Nm keynote keygen
 .Ar AlgorithmName
 .Ar KeySize
 .Ar PublicKeyFile
@@ -85,6 +85,7 @@ the end of each line, and the doublequotes at the begining and end
 of the key encoding.  Default values are 12 and 50 respectively.
 .Pp
 .Sh SEE ALSO
+.Xr keynote 1 ,
 .Xr keynote 3 ,
 .Xr keynote 4 ,
 .Xr keynote-sign 1 ,
diff --git a/lib/libkeynote/keynote-main.c b/lib/libkeynote/keynote-main.c
index 352bbed466c..44115fd798e 100644
--- a/lib/libkeynote/keynote-main.c
+++ b/lib/libkeynote/keynote-main.c
@@ -43,18 +43,28 @@ int
 #endif
 main(int argc, char *argv[])
 {
-    if (!strcmp(argv[0], "keynote-sign"))
-      keynote_sign(argc, argv);
+    if (argc < 2)
+    {
+	fprintf(stderr, "Insufficient number of arguments.\n");
+	exit(-1);
+    }
+
+    if (!strcmp(argv[1], "sign"))
+      keynote_sign(argc - 1, argv + 1);
     else
-      if (!strcmp(argv[0], "keynote-verify"))
-	keynote_verify(argc, argv);
+      if (!strcmp(argv[1], "verify"))
+	keynote_verify(argc - 1, argv + 1);
       else
-	if (!strcmp(argv[0], "keynote-sigver"))
-	  keynote_sigver(argc, argv);
+	if (!strcmp(argv[1], "sigver"))
+	  keynote_sigver(argc - 1, argv + 1);
 	else
-	  if (!strcmp(argv[0], "keynote-keygen"))
-	    keynote_keygen(argc, argv);
+	  if (!strcmp(argv[1], "keygen"))
+	    keynote_keygen(argc - 1, argv + 1);
 
-    fprintf(stderr, "%s: invoked under unknown name.\n", argv[0]);
+    fprintf(stderr, "Usage:\n");
+    fprintf(stderr, "\tsign ...\n");
+    fprintf(stderr, "\tsigver ...\n");
+    fprintf(stderr, "\tverify ...\n");
+    fprintf(stderr, "\tkeygen ...\n");
     exit(-1);
 }
diff --git a/lib/libkeynote/keynote-sign.1 b/lib/libkeynote/keynote-sign.1
index 3e373984205..a992bcb4112 100644
--- a/lib/libkeynote/keynote-sign.1
+++ b/lib/libkeynote/keynote-sign.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote-sign.1,v 1.1 1999/05/23 22:32:07 angelos Exp $
+.\" $OpenBSD: keynote-sign.1,v 1.2 1999/05/24 01:50:04 angelos Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -25,7 +25,7 @@
 .Os
 .\" .TH keynote-sign 1 local
 .Sh NAME
-.Nm keynote-sign
+.Nm keynote sign
 .Nd command line tool for signing
 .Xr KeyNote 3
 assertions
@@ -101,6 +101,7 @@ will also verify the newly-created signature using the
 .Fa Authorizer
 field key.
 .Sh SEE ALSO
+.Xr keynote 1 ,
 .Xr keynote 3 ,
 .Xr keynote 4 ,
 .Xr keynote-keygen 1 ,
diff --git a/lib/libkeynote/keynote-sigver.1 b/lib/libkeynote/keynote-sigver.1
index ae6d1b63373..067c709d2ad 100644
--- a/lib/libkeynote/keynote-sigver.1
+++ b/lib/libkeynote/keynote-sigver.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote-sigver.1,v 1.1 1999/05/23 22:32:08 angelos Exp $
+.\" $OpenBSD: keynote-sigver.1,v 1.2 1999/05/24 01:50:04 angelos Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -25,7 +25,7 @@
 .Os
 .\" .TH keynote-sigver 1 local
 .Sh NAME
-.Nm keynote-sigver
+.Nm keynote sigver
 .Nd command line tool for verifying signed
 .Xr KeyNote 3
 assertions
@@ -45,6 +45,7 @@ reads the assertion contained in
 .Fa AssertionFile
 and verifies the public key signature on it.
 .Sh SEE ALSO
+.Xr keynote 1 ,
 .Xr keynote 3 ,
 .Xr keynote 4 ,
 .Xr keynote-keygen 1 ,
diff --git a/lib/libkeynote/keynote-verify.1 b/lib/libkeynote/keynote-verify.1
index f25013b6f1c..a2c82290191 100644
--- a/lib/libkeynote/keynote-verify.1
+++ b/lib/libkeynote/keynote-verify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote-verify.1,v 1.1 1999/05/23 22:32:08 angelos Exp $
+.\" $OpenBSD: keynote-verify.1,v 1.2 1999/05/24 01:50:04 angelos Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -25,7 +25,7 @@
 .Os
 .\" .TH keynote-verify 1 local
 .Sh NAME
-.Nm keynote-verify
+.Nm keynote verify
 .Nd command line tool for evaluating
 .Xr KeyNote 3
 assertions
@@ -110,6 +110,7 @@ The
 .Nm keynote-verify
 exits with code -1 if there was an error, and 0 on success.
 .Sh SEE ALSO
+.Xr keynote 1 ,
 .Xr keynote 3 ,
 .Xr keynote 4 ,
 .Xr keynote-keygen 1 ,
diff --git a/lib/libkeynote/keynote.3 b/lib/libkeynote/keynote.3
index 73002a28793..cd9596883c5 100644
--- a/lib/libkeynote/keynote.3
+++ b/lib/libkeynote/keynote.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.3,v 1.1 1999/05/23 22:32:08 angelos Exp $
+.\" $OpenBSD: keynote.3,v 1.2 1999/05/24 01:50:04 angelos Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -740,6 +740,8 @@ algorithm was not supported.
 .Fd keynote.h
 .Fd libkeynote.a
 .Sh SEE ALSO
+.Xr keynote 1 ,
+.Xr keynote 4 ,
 .Xr keynote-keygen 1 , 
 .Xr keynote-sign 1 , 
 .Xr keynote-sigver 1 ,
diff --git a/lib/libkeynote/keynote.4 b/lib/libkeynote/keynote.4
index 15e69331133..64565563432 100644
--- a/lib/libkeynote/keynote.4
+++ b/lib/libkeynote/keynote.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.4,v 1.1 1999/05/23 22:32:09 angelos Exp $
+.\" $OpenBSD: keynote.4,v 1.2 1999/05/24 01:50:04 angelos Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -238,6 +238,7 @@ actions.
 .Fd keynote.h
 .Fd libkeynote.a
 .Sh SEE ALSO
+.Xr keynote 1 ,
 .Xr keynote 3 ,
 .Xr keynote-keygen 1 , 
 .Xr keynote-sign 1 ,