From 99dde2f4337259f7fbacb9394ad981fec3608f67 Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Fri, 23 Feb 2001 09:03:27 +0000
Subject: [PATCH] Simplify usage message by removing nonexistant options.

---
 keyutil.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/keyutil.c b/keyutil.c
index 80278ad..3f3218e 100644
--- a/keyutil.c
+++ b/keyutil.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: keyutil.c,v 1.13 2001/02/21 20:04:27 mdw Exp $
+ * $Id: keyutil.c,v 1.14 2001/02/23 09:03:27 mdw Exp $
  *
  * Simple key manager program
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: keyutil.c,v $
+ * Revision 1.14  2001/02/23 09:03:27  mdw
+ * Simplify usage message by removing nonexistant options.
+ *
  * Revision 1.13  2001/02/21 20:04:27  mdw
  * Provide help on individual commands (some need it desparately).  Allow
  * atomic retagging of keys.
@@ -1693,7 +1696,7 @@ static cmd *findcmd(const char *name)
 
 void usage(FILE *fp)
 {
-  pquis(fp, "Usage: $ [-k file] [-i tag] [-t type] command [args]\n");
+  pquis(fp, "Usage: $ [-k keyring] command [args]\n");
 }
 
 void version(FILE *fp)
@@ -1709,7 +1712,7 @@ void help(FILE *fp, char **argv)
   fputc('\n', fp);
   if (*argv) {
     c = findcmd(*argv);
-    fprintf(fp, "Usage: %s [-options] %s\n", QUIS, c->usage);
+    fprintf(fp, "Usage: %s [-k keyring] %s\n", QUIS, c->usage);
     if (c->help) {
       fputc('\n', fp);	
       fputs(c->help, fp);
@@ -1772,14 +1775,12 @@ int main(int argc, char *argv[])
       /* --- Real live useful options --- */
 
       { "keyring",	OPTF_ARGREQ,	0,	'k' },
-      { "id",		OPTF_ARGREQ,	0,	'i' },
-      { "type",		OPTF_ARGREQ,	0,	't' },
 
       /* --- Magic terminator --- */
 
       { 0,		0,		0,	0 }
     };
-    int i = mdwopt(argc, argv, "+hvu k:i:t:", opt, 0, 0, 0);
+    int i = mdwopt(argc, argv, "+hvu k:", opt, 0, 0, 0);
 
     if (i < 0)
       break;
-- 
2.11.0