*** empty log message ***

[h316.git] / pc-tools / ldc2 / src / main.cpp

diff --git a/pc-tools/ldc2/src/main.cpp b/pc-tools/ldc2/src/main.cpp
index a86291b519c9ed0d5e2750050a6c091d3b6e8dec..282ce9a6eff410624f1cea52da3158d074dc864e 100644 (file)
--- a/pc-tools/ldc2/src/main.cpp
+++ b/pc-tools/ldc2/src/main.cpp
@@ -24,7 +24,6 @@ int dump_vector(vector<string> arguments){
 }
 
 
-
 int main(int argc, char ** args){
   
   /* Configuration data */
@@ -127,11 +126,28 @@ Errors will be converted to warnings.",
                      &config_file_set,&config_file,
                      "<file-name>");
   
+  // Process command line first time
   if((dump_vector(ar.read_args(argc,args))||do_help)){
     dump_vector(ar.get_help());
     exit(1);
   }
   
+  // If user has a config file, use it.
+  if (config_file_set){
+    if(dump_vector(ar.read_file(config_file))){
+      dump_vector(ar.get_help());
+      exit(1);
+    }
+    // Process command line a second time to override values from config file.
+    if(dump_vector(ar.read_args(argc,args))||do_help){
+      dump_vector(ar.get_help());
+      exit(1);
+    }
+  }
+ 
+
+
+  
   if (infile_set==1){
     printf("Opening file for input:%s\n",infile.c_str());
     in_fd=open(infile.c_str(),O_RDONLY);