Bug 157946: removed the unused -m option. Added the -v option to Usage().
authorwtc%netscape.com
Wed, 17 Jul 2002 18:39:02 +0000
changeset 3329 76aa2ea14ad43936cde3d2ff946e06e33d3974cd
parent 3328 f43a55d9730184ac05699a36ebc42a12621e9cbf
child 3330 c091c70e17d74ef476fada923c2b8af08b1e4315
push idunknown
push userunknown
push dateunknown
bugs157946
Bug 157946: removed the unused -m option. Added the -v option to Usage().
security/nss/cmd/pk12util/pk12util.c
--- a/security/nss/cmd/pk12util/pk12util.c
+++ b/security/nss/cmd/pk12util/pk12util.c
@@ -49,18 +49,20 @@ PRIntn pk12uErrno = 0;
 
 static void
 Usage(char *progName)
 {
 #define FPS PR_fprintf(PR_STDERR,
     FPS "Usage:	 %s -i importfile [-d certdir] [-P dbprefix] [-h tokenname]\n",
 				 progName);
     FPS "\t\t [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]\n");
+    FPS "\t\t [-v]\n");
     FPS "Usage:	 %s -o exportfile -n certname [-d certdir] [-P dbprefix]\n", progName);
     FPS "\t\t [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]\n");
+    FPS "\t\t [-v]\n");
     exit(PK12UERR_USAGE);
 }
 
 static PRBool
 p12u_OpenExportFile(p12uContext *p12cxt, PRBool fileRead)
 {
     if(!p12cxt || !p12cxt->filename) {
 	return PR_FALSE;
@@ -706,33 +708,31 @@ P12U_Init(char *dir, char *dbprefix)
 }
 
 enum {
     opt_CertDir = 0,
     opt_TokenName,
     opt_Import,
     opt_SlotPWFile,
     opt_SlotPW,
-    opt_Mode,
     opt_Nickname,
     opt_Export,
     opt_P12FilePWFile,
     opt_P12FilePW,
     opt_DBPrefix,
     opt_Debug
 };
 
 static secuCommandFlag pk12util_options[] =
 {
     { /* opt_CertDir	       */ 'd', PR_TRUE,	 0, PR_FALSE },
     { /* opt_TokenName	       */ 'h', PR_TRUE,	 0, PR_FALSE },
     { /* opt_Import	       */ 'i', PR_TRUE,	 0, PR_FALSE },
     { /* opt_SlotPWFile	       */ 'k', PR_TRUE,	 0, PR_FALSE },
     { /* opt_SlotPW	       */ 'K', PR_TRUE,	 0, PR_FALSE },
-    { /* opt_Mode	       */ 'm', PR_TRUE,	 0, PR_FALSE },
     { /* opt_Nickname	       */ 'n', PR_TRUE,	 0, PR_FALSE },
     { /* opt_Export	       */ 'o', PR_TRUE,	 0, PR_FALSE },
     { /* opt_P12FilePWFile     */ 'w', PR_TRUE,	 0, PR_FALSE },
     { /* opt_P12FilePW	       */ 'W', PR_TRUE,	 0, PR_FALSE },
     { /* opt_DBPrefix	       */ 'P', PR_TRUE,	 0, PR_FALSE },
     { /* opt_Debug	       */ 'v', PR_FALSE, 0, PR_FALSE }
 };