1 files changed, 23 insertions, 14 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();