[rs-commit] r99 - /redwax-tool/trunk/redwax-tool.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Tue Nov 30 15:21:22 2021
New Revision: 99

Log:
Rename text to text-out.

Modified:
    redwax-tool/trunk/redwax-tool.c

Modified: redwax-tool/trunk/redwax-tool.c
==============================================================================
--- redwax-tool/trunk/redwax-tool.c	(original)
+++ redwax-tool/trunk/redwax-tool.c	Tue Nov 30 15:21:22 2021
@@ -183,6 +183,7 @@
 #define REDWAX_TOOL_METADATA_OUT 293
 #define REDWAX_TOOL_FORMAT_OUT 294
 #define REDWAX_TOOL_JWKS_OUT 295
+#define REDWAX_TOOL_TEXT_OUT 296
 
 #define REDWAX_EXIT_OK 0
 #define REDWAX_EXIT_INIT 1
@@ -204,8 +205,6 @@
         "  -q, --quiet\t\t\tBe quiet. Errors are suppressed." },
     { "debug", 'd', 0,
         "  -d, --debug\t\t\tBe loud. Print additional details of our progress." },
-    { "text", 't', 0,
-        "  -t, --text\t\t\tInclude text in certificate output." },
     { "secret-suffix-in", REDWAX_TOOL_SECRET_SUFFIX_IN, 1, "  --secret-suffix-in=suffix\tIf specified, secrets will be read from a file\n\t\t\t\twith the same name as the source file, and\n\t\t\t\tthe suffix specified. With value 'secret',\n\t\t\t\ta file 'key.pem' will have the secret loaded\n\t\t\t\tfrom 'key.secret' in the same directory." },
     { "secret-suffix-out", REDWAX_TOOL_SECRET_SUFFIX_OUT, 1, "  --secret-suffix-out=suffix\tIf specified, secrets will be read from a file\n\t\t\t\twith the same name as the target file, and\n\t\t\t\tthe suffix specified. With value 'secret',\n\t\t\t\ta file 'key.pem' will have the secret loaded\n\t\t\t\tfrom 'key.secret' in the same directory." },
     { "secret-token-in", REDWAX_TOOL_SECRET_TOKEN_IN, 1, "  --secret-token-in=file\tIf specified, secrets needed to read\n\t\t\t\tcertificates and keys from tokens will be read\n\t\t\t\tfrom a file one secret per line. Each secret\n\t\t\t\tis preceded by the name of the token and a\n\t\t\t\tcolon, as per the NSS pwdfile.txt file." },
@@ -220,6 +219,8 @@
     { "hostname", REDWAX_TOOL_HOSTNAME, 1, "  --hostname=domain\t\tSearch/verify by the given hostname. Leaf\n\t\t\t\tcertificates matching the hostname will be\n\t\t\t\tkept, taking into account wildcards where\n\t\t\t\tpresent." },
     { "ip", REDWAX_TOOL_IP, 1, "  --ip=address\t\t\tSearch/verify by the given IP address. Leaf\n\t\t\t\tcertificates matching the IP address will be\n\t\t\t\tincluded. Can be specified more than once." },
     { "current", REDWAX_TOOL_CURRENT, 0, "  --current\t\t\tMatch the top ranking leaf certificate, and\n\t\t\t\tignore all other leaf certificates. The top\n\t\t\t\tcertificate is valid, and has the longest time\n\t\t\t\tto expiry." },
+    { "text-out", REDWAX_TOOL_TEXT_OUT, 0,
+        "  --text-out\t\t\tInclude additional text in certificate PEM and\n\t\t\t\tmetadata output." },
     { "cert-out", REDWAX_TOOL_CERT_OUT, 0,
         "  --cert-out\t\t\tInclude leaf certificates in certificate output." },
     { "no-cert-out", REDWAX_TOOL_NO_CERT_OUT, 0,
@@ -2071,10 +2072,6 @@
             help(r->out, argv[0], NULL, 0, cmdline_opts);
             return REDWAX_EXIT_OK;
         }
-        case 't': {
-            r->text++;
-            break;
-        }
         case 'q': {
             r->quiet++;
             break;
@@ -2193,6 +2190,10 @@
             == APR_SUCCESS) {
 
         switch (optch) {
+        case REDWAX_TOOL_TEXT_OUT: {
+            r->text++;
+            break;
+        }
         case REDWAX_TOOL_CERT_OUT: {
             redwax_set_cert_out(r);
             break;