Add --help support to all of the C programs in $top/utils/*.

svn path=/trunk/; revision=5640

6 files changed, 216 insertions, 119 deletions

diff --git a/utils/find_roa/find_roa.c b/utils/find_roa/find_roa.c
index e91aead3..cc6325ea 100644
--- a/utils/find_roa/find_roa.c
+++ b/utils/find_roa/find_roa.c
@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
- *
+ * Copyright (C) 2014  Dragon Research Labs ("DRL")
+ * Portions copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
+ * 
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * copyright notices and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ARIN DISCLAIM ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL OR
+ * ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
@@ -286,6 +288,12 @@ static int handle_directory(const char *name, const unsigned prefix_afi, const u
   return ret;
 }
 
+static void usage (const char *jane, const int code)
+{
+  fprintf(code ? stderr : stdout, "usage: %s authtree prefix [prefix...]\n", jane);
+  exit(code);
+}
+
 int main (int argc, char *argv[])
 {
   unsigned char prefix[ADDR_RAW_BUF_LEN];
@@ -294,10 +302,11 @@ int main (int argc, char *argv[])
   char *s = NULL, *p = NULL;
   int i, len, ret = 1;
 
-  if (argc < 3) {
-    fprintf(stderr, "usage: %s authtree prefix [prefix...]\n", argv[0]);
-    return 1;
-  }
+  if (argc == 2 && (strcmp(argv[1], "-h") || strcmp(argv[1], "--help")))
+    usage(argv[0], 0);
+
+  if (argc < 3)
+    usage(argv[0], 1);
 
   OpenSSL_add_all_algorithms();
   ERR_load_crypto_strings();
diff --git a/utils/hashdir/hashdir.c b/utils/hashdir/hashdir.c
index cf764719..bd9d06a8 100644
--- a/utils/hashdir/hashdir.c
+++ b/utils/hashdir/hashdir.c
@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
- *
+ * Copyright (C) 2014  Dragon Research Labs ("DRL")
+ * Portions copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
+ * 
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * copyright notices and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ARIN DISCLAIM ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL OR
+ * ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
@@ -196,12 +198,19 @@ static int handle_directory(const char *name, const char *targetdir)
   return ret;
 }
 
+static void usage (const char *jane, const int code)
+{
+  fprintf(code ? stderr : stdout, "usage: %s input-directory output-directory\n", jane);
+  exit(code);
+}
+
 int main(int argc, char *argv[])
 {
-  if (argc != 3) {
-    fprintf(stderr, "usage: %s input-directory output-directory\n", argv[0]);
-    return 1;
-  }
+  if (argc == 2 && (strcmp(argv[1], "-h") || strcmp(argv[1], "--help")))
+    usage(argv[0], 0);
+
+  if (argc != 3)
+    usage(argv[0], 1);
 
   return !handle_directory(argv[1], argv[2]);
 }
diff --git a/utils/print_roa/print_roa.c b/utils/print_roa/print_roa.c
index 98f0985a..a1088958 100644
--- a/utils/print_roa/print_roa.c
+++ b/utils/print_roa/print_roa.c
@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2008  American Registry for Internet Numbers ("ARIN")
- *
+ * Copyright (C) 2014  Dragon Research Labs ("DRL")
+ * Portions copyright (C) 2008  American Registry for Internet Numbers ("ARIN")
+ * 
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * copyright notices and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ARIN DISCLAIM ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL OR
+ * ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
@@ -28,6 +30,7 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
+#include <getopt.h>
 
 #include <openssl/bio.h>
 #include <openssl/pem.h>
@@ -306,19 +309,40 @@ static ROA *read_roa(const char *filename,
 
 
 
+const static struct option longopts[] = {
+  { "brief",	   no_argument, NULL, 'b' },
+  { "print-cms",   no_argument, NULL, 'c' },
+  { "help",	   no_argument, NULL, 'h' },
+  { "signingtime", no_argument, NULL, 's' },
+  { NULL }
+};
+
+static int usage (const char *jane, const int code)
+{
+  FILE *out = code ? stderr : stdout;
+  int i;
+
+  fprintf(out, "usage: %s [options] ROA [ROA...]\n", jane);
+  fprintf(out, "options:\n");
+  for (i = 0; longopts[i].name != NULL; i++)
+    fprintf(out, "  -%c  --%s\n", longopts[i].val, longopts[i].name);
+
+  return code;
+}
+
 /*
  * Main program.
  */
 int main (int argc, char *argv[])
 {
   int result = 0, print_brief = 0, print_signingtime = 0, print_cms = 0, c;
-  char *jane = argv[0];
+  const char *jane = argv[0];
   ROA *r;
 
   OpenSSL_add_all_algorithms();
   ERR_load_crypto_strings();
 
-  while ((c = getopt(argc, argv, "bcs")) != -1) {
+  while ((c = getopt_long(argc, argv, "bchs", longopts, NULL)) != -1) {
     switch (c) {
     case 'b':
       print_brief = 1;
@@ -329,16 +353,19 @@ int main (int argc, char *argv[])
     case 's':
       print_signingtime = 1;
       break;
-    case '?':
+    case 'h':
+      return usage(jane, 0);
     default:
-      fprintf(stderr, "usage: %s [-b] [-c] [-s] ROA [ROA...]\n", jane);
-      return 1;
+      return usage(jane, 1);
     }
   }
 
   argc -= optind;
   argv += optind;
 
+  if (argc == 0)
+    return usage(jane, 1);
+
   while (argc-- > 0) {
     r = read_roa(*argv++, print_cms, 1, !print_brief, print_brief, print_signingtime);
     result |=  r == NULL;
diff --git a/utils/print_rpki_manifest/print_rpki_manifest.c b/utils/print_rpki_manifest/print_rpki_manifest.c
index ef0e67d2..4bdea2b6 100644
--- a/utils/print_rpki_manifest/print_rpki_manifest.c
+++ b/utils/print_rpki_manifest/print_rpki_manifest.c
@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2008  American Registry for Internet Numbers ("ARIN")
- *
+ * Copyright (C) 2014  Dragon Research Labs ("DRL")
+ * Portions copyright (C) 2008  American Registry for Internet Numbers ("ARIN")
+ * 
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * copyright notices and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ARIN DISCLAIM ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL OR
+ * ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
@@ -27,6 +29,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <getopt.h>
 
 #include <openssl/bio.h>
 #include <openssl/pem.h>
@@ -166,32 +169,56 @@ static const Manifest *read_manifest(const char *filename,
   return m;
 }
 
+
+
+const static struct option longopts[] = {
+  { "print-cms",   no_argument, NULL, 'c' },
+  { "help",	   no_argument, NULL, 'h' },
+  { NULL }
+};
+
+static int usage (const char *jane, const int code)
+{
+  FILE *out = code ? stderr : stdout;
+  int i;
+
+  fprintf(out, "usage: %s [options] ROA [ROA...]\n", jane);
+  fprintf(out, "options:\n");
+  for (i = 0; longopts[i].name != NULL; i++)
+    fprintf(out, "  -%c  --%s\n", longopts[i].val, longopts[i].name);
+
+  return code;
+}
+
 /*
  * Main program.
  */
 int main (int argc, char *argv[])
 {
   int result = 0, print_cms = 0, c;
-  char *jane = argv[0];
+  const char *jane = argv[0];
 
   OpenSSL_add_all_algorithms();
   ERR_load_crypto_strings();
 
-  while ((c = getopt(argc, argv, "c")) != -1) {
+  while ((c = getopt_long(argc, argv, "ch", longopts, NULL)) != -1) {
     switch (c) {
     case 'c':
       print_cms = 1;
       break;
-    case '?':
+    case 'h':
+      return usage(jane, 0);
     default:
-      fprintf(stderr, "usage: %s [-c] manifest [manifest...]\n", jane);
-      return 1;
+      return usage(jane, 1);
     }
   }
 
   argc -= optind;
   argv += optind;
 
+  if (argc == 0)
+    return usage(jane, 1);
+
   while (argc-- > 0)
     result |=  read_manifest(*argv++, print_cms, 1, 1) == NULL;
   return result;
diff --git a/utils/scan_roas/scan_roas.c b/utils/scan_roas/scan_roas.c
index 7765a603..5bc19063 100644
--- a/utils/scan_roas/scan_roas.c
+++ b/utils/scan_roas/scan_roas.c
@@ -1,30 +1,18 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium ("ISC")
+ * Copyright (C) 2014  Dragon Research Labs ("DRL")
+ * Portions copyright (C) 2011  Internet Systems Consortium ("ISC")
  * 
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * copyright notices and this permission notice appear in all copies.
  * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * Portions copyright (C) 2008  American Registry for Internet Numbers ("ARIN")
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ISC DISCLAIM ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL OR
+ * ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
@@ -287,6 +275,12 @@ static int walk(const char *name)
 
 
 
+static void usage (const char *jane, const int code)
+{
+  fprintf(code ? stderr : stdout, "usage: %s authtree [authtree...]\n", jane);
+  exit(code);
+}
+
 /*
  * Main program.
  */
@@ -294,6 +288,12 @@ int main (int argc, char *argv[])
 {
   int i, ok = 1;
 
+  if (argc == 2 && (strcmp(argv[1], "-h") || strcmp(argv[1], "--help")))
+    usage(argv[0], 0);
+
+  if (argc < 2)
+    usage(argv[0], 1);
+
   OpenSSL_add_all_algorithms();
   ERR_load_crypto_strings();
 
diff --git a/utils/uri/uri.c b/utils/uri/uri.c
index e741de5c..6353e8e5 100644
--- a/utils/uri/uri.c
+++ b/utils/uri/uri.c
@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
- *
+ * Copyright (C) 2014  Dragon Research Labs ("DRL")
+ * Portions copyright (C) 2006--2008  American Registry for Internet Numbers ("ARIN")
+ * 
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * copyright notices and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ARIN DISCLAIM ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL OR
+ * ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
@@ -27,6 +29,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <getopt.h>
+
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>
@@ -131,7 +135,8 @@ static enum decode_errors decode_crldp(X509 *x, int verbose, int spaces)
   return err;
 }
 
-#define decode_xia(_x_, _v_, _s_, _tag_, _nid_, _oid_)  _decode_xia(_x_, _v_, _s_, _tag_, _nid_, _oid_, sizeof(_oid_))
+#define decode_xia(_x_, _v_, _s_, _tag_, _nid_, _oid_) \
+  _decode_xia(_x_, _v_, _s_, _tag_, _nid_, _oid_, sizeof(_oid_))
 
 static enum decode_errors _decode_xia(X509 *x,
 				      int verbose,
@@ -164,9 +169,34 @@ static enum decode_errors _decode_xia(X509 *x,
   return err;
 }
 
+
+
+const static struct option longopts[] = {
+  { "der",         no_argument, NULL, 'd' },
+  { "help",	   no_argument, NULL, 'h' },
+  { "pem",	   no_argument, NULL, 'p' },
+  { "spaces",      no_argument, NULL, 's' },
+  { "verbose",	   no_argument, NULL, 'v' },
+  { NULL }
+};
+
+static int usage (const char *jane, const int code)
+{
+  FILE *out = code ? stderr : stdout;
+  int i;
+
+  fprintf(out, "usage: %s [-p | -d] cert [cert...]\n", jane);
+  fprintf(out, "options:\n");
+  for (i = 0; longopts[i].name != NULL; i++)
+    fprintf(out, "  -%c  --%s\n", longopts[i].val, longopts[i].name);
+
+  return code;
+}
+
 int main(int argc, char *argv[])
 {
-  int c, format = 'd', spaces = 0, ret = 0, verbose = 0;
+  int c, format = 'd', spaces = 0, verbose = 0;
+  const char *jane = argv[0];
   X509 *x;
 
   OpenSSL_add_all_algorithms();
@@ -184,40 +214,35 @@ int main(int argc, char *argv[])
     case 's':
       spaces = 1;
       break;
+    case 'h':
+      return usage(jane, 0);
     default:
-      ret = 1;
+      return usage(jane, 1);
     }
   }
 
-  if (argc == optind)
-    ret = 1;
-
-  if (ret != 0)
-    fprintf(stderr, "usage: %s [-p | -d] cert [cert...]\n", argv[0]);
+  argc -= optind;
+  argv += optind;
 
-  if (ret == 0) {
-    argc -= optind;
-    argv += optind;
+  if (argc == 0)
+    return usage(jane, 1);
 
-    while (argc-- > 0) {
-      printf(spaces ? "%s" : "File: %s\n", *argv);
-      if ((x = read_cert(*argv++, format, verbose)) == NULL) {
-	printf("Couldn't read certificate, skipping\n");
-	continue;
-      }
-      decode_xia(x, verbose, spaces, "AIA:caIssuers",              NID_info_access,  id_ad_caIssuers);
-      decode_xia(x, verbose, spaces, "SIA:caRepository",           NID_sinfo_access, id_ad_caRepository);
-      decode_xia(x, verbose, spaces, "SIA:signedObjectRepository", NID_sinfo_access, id_ad_signedObjectRepository);
-      decode_xia(x, verbose, spaces, "SIA:rpkiManifest",           NID_sinfo_access, id_ad_rpkiManifest);
-      decode_xia(x, verbose, spaces, "SIA:signedObject",           NID_sinfo_access, id_ad_signedObject);
-      decode_crldp(x, verbose, spaces);
-      if (spaces)
-	putchar('\n');
-      X509_free(x);
+  while (argc-- > 0) {
+    printf(spaces ? "%s" : "File: %s\n", *argv);
+    if ((x = read_cert(*argv++, format, verbose)) == NULL) {
+      printf("Couldn't read certificate, skipping\n");
+      continue;
     }
+    decode_xia(x, verbose, spaces, "AIA:caIssuers",              NID_info_access,  id_ad_caIssuers);
+    decode_xia(x, verbose, spaces, "SIA:caRepository",           NID_sinfo_access, id_ad_caRepository);
+    decode_xia(x, verbose, spaces, "SIA:signedObjectRepository", NID_sinfo_access, id_ad_signedObjectRepository);
+    decode_xia(x, verbose, spaces, "SIA:rpkiManifest",           NID_sinfo_access, id_ad_rpkiManifest);
+    decode_xia(x, verbose, spaces, "SIA:signedObject",           NID_sinfo_access, id_ad_signedObject);
+    decode_crldp(x, verbose, spaces);
+    if (spaces)
+      putchar('\n');
+    X509_free(x);
   }
 
-  EVP_cleanup();
-  ERR_free_strings();
-  return ret;
+  return 0;
 }