Bug 783579: Fix the formatting of the help message for --keyAttrFlags,
authorWan-Teh Chang <wtc@google.com>
Thu, 23 May 2013 13:49:27 -0700
changeset 10791 fc9412503bda91005d32b323b64f32c7b43fdcb0
parent 10790 e9e054c6c03f49a911e487c46dc7f0d361163932
child 10792 db5b7e3c69a546bf6783622b56e477251b768818
push id100
push userwtc@google.com
push dateThu, 23 May 2013 20:49:30 +0000
bugs783579
Bug 783579: Fix the formatting of the help message for --keyAttrFlags, --keyOpFlagsOn, and --keyOpFlagsOff. r=emaldona.
cmd/certutil/certutil.c
--- a/cmd/certutil/certutil.c
+++ b/cmd/certutil/certutil.c
@@ -1197,26 +1197,28 @@ static void luG(enum usage_level ul, con
     FPS "%-20s secp112r2, secp128r1, secp128r2, sect113r1, sect113r2\n", "");
     FPS "%-20s sect131r1, sect131r2\n", "");
 #endif /* NSS_ECC_MORE_THAN_SUITE_B */
 #endif
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
         "   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
         "   -P dbprefix");
-    FPS "%-20s PKCS #11 key Attributes\n",
-        "   --keyAttrFlags attrflags.");
+    FPS "%-20s\n"
+        "%-20s PKCS #11 key Attributes.\n",
+        "   --keyAttrFlags attrflags", "");
     FPS "%-20s Comma separated list of key attribute attribute flags,\n", "");
     FPS "%-20s selected from the following list of choices:\n", "");
     FPS "%-20s {token | session} {public | private} {sensitive | insensitive}\n", "");
     FPS "%-20s {modifiable | unmodifiable} {extractable | unextractable}\n", "");
-    FPS "%-20s PKCS #11 key Operation Flags\n",
-        "   --keyOpFlagsOn opflags.");
-    FPS "%-20s PKCS #11 key Operation Flags\n",
-        "   --keyOpFlagsOff opflags.");
+    FPS "%-20s\n",
+        "   --keyOpFlagsOn opflags");
+    FPS "%-20s\n"
+        "%-20s PKCS #11 key Operation Flags.\n",
+        "   --keyOpFlagsOff opflags", "");
     FPS "%-20s Comma separated list of one or more of the following:\n", "");
     FPS "%-20s encrypt, decrypt, sign, sign_recover, verify,\n", "");
     FPS "%-20s verify_recover, wrap, unwrap, derive\n", "");
     FPS "\n");
 }
 
 static void luD(enum usage_level ul, const char *command)
 {
@@ -1442,17 +1444,17 @@ static void luR(enum usage_level ul, con
         "   -P dbprefix");
     FPS "%-20s Specify the contact phone number (\"123-456-7890\")\n",
         "   -p phone");
     FPS "%-20s Output the cert request in ASCII (RFC1113); default is binary\n",
         "   -a");
     FPS "%-20s \n",
         "   See -S for available extension options");
     FPS "%-20s \n",
-        "   See -G for available key flag  options");
+        "   See -G for available key flag options");
     FPS "\n");
 }
 
 static void luV(enum usage_level ul, const char *command)
 {
     int is_my_command = (command && 0 == strcmp(command, "V"));
     if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Validate a certificate\n",
@@ -1626,17 +1628,17 @@ static void luS(enum usage_level ul, con
         "   --extPM ");
     FPS "%-20s Create a Policy Constraints extension\n",
         "   --extPC ");
     FPS "%-20s Create an Inhibit Any Policy extension\n",
         "   --extIA ");
     FPS "%-20s Create a subject key ID extension\n",
         "   --extSKID ");
     FPS "%-20s \n",
-        "   See -G for available key flag  options");
+        "   See -G for available key flag options");
     FPS "%-20s Create a name constraints extension\n",
         "   --extNC ");
     FPS "\n");
 }
 
 static void LongUsage(char *progName, enum usage_level ul, const char *command)
 {
     luA(ul, command);