X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=tr%2Ftr_main.c;fp=tr%2Ftr_main.c;h=20ea516afce2c028f40a71163a9eb1d46847fe12;hb=31bd95bf7af1c5269f08526fba49ca04edc58440;hp=a03ef4b12bf0e2069633ad83a08b5818c5cbba8d;hpb=eaa1a8ceed54fbfadc2638cf383aaa12ab446a57;p=trust_router.git

diff --git a/tr/tr_main.c b/tr/tr_main.c
index a03ef4b..20ea516 100644
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -81,13 +81,15 @@ static const char arg_doc[]=""; /* string describing arguments, if any */
  * { long-name, short-name, variable name, options, help description } */
 static const struct argp_option cmdline_options[] = {
     { "config-dir", 'c', "DIR", 0, "Specify configuration file location (default is current directory)"},
-    { "version", 'v', NULL, 0, "Print version information and exit"},
+    { "version", 1, NULL, 0, "Print version information and exit"},
+    { "validate-config", 'v', NULL, 0, "Validate configuration files and exit"},
     { NULL }
 };
 
 /* structure for communicating with option parser */
 struct cmdline_args {
     int version_requested;
+    int validate_config_and_exit;
     char *config_dir;
 };
 
@@ -106,10 +108,14 @@ static error_t parse_option(int key, char *arg, struct argp_state *state)
       arguments->config_dir=arg;
       break;
 
-    case 'v':
+    case 1:
       arguments->version_requested=1;
       break;
 
+    case 'v':
+      arguments->validate_config_and_exit=1;
+      break;
+
     default:
       return ARGP_ERR_UNKNOWN;
   }
@@ -171,6 +177,7 @@ int main(int argc, char *argv[])
   /***** parse command-line arguments *****/
   /* set defaults */
   opts.version_requested=0;
+  opts.validate_config_and_exit=0;
   opts.config_dir=".";
 
   /* parse the command line*/
@@ -219,6 +226,11 @@ int main(int argc, char *argv[])
     return 1;
   }
 
+  /***** Exit here if we are just validating our configuration *****/
+  if (opts.validate_config_and_exit) {
+    printf("Valid configuration found in %s.\n", opts.config_dir);
+    return 0;
+  }
   /***** Set up the event loop *****/
   ev_base=tr_event_loop_init(); /* Set up the event loop */
   if (ev_base==NULL) {