Changeset 1070

Timestamp:

Jun 6, 2010, 5:32:03 AM (13 years ago)

Author:

Peter Johansson

Message:

refs #307. write config if option for it is given

Location:

trunk

Files:

• bin/svncopyright.cc (modified) (2 diffs)
• bin/svndigest.cc (modified) (2 diffs)
• lib/main_utility.cc (modified) (2 diffs)
• lib/main_utility.h (modified) (1 diff)

trunk/bin/svncopyright.cc

@@ -22 +22 @@
 #include "svncopyrightParameter.h"
 
+#include "Configuration.h"
 #include "main_utility.h"
 
@@ -47 +48 @@
   try {
     load_config(option.config_file());
+    if (option.generate_config()) {
+      std::cout << Configuration::instance();
+      return EXIT_SUCCESS;
+    }
   }
   catch (std::runtime_error& e) {

trunk/bin/svndigest.cc

@@ -76 +76 @@
     load_config(option.config_file());
     copy_option2config(option, Configuration::instance());
+    if (option.generate_config()) {
+      std::cout << Configuration::instance();
+      return EXIT_SUCCESS;
+    }
   }
   catch (std::runtime_error& e) {
@@ -84 +88 @@
   // just for convenience
   Configuration& config = Configuration::instance();
-  // set values from commandline into config object
-  // write configuration
-  if (option.generate_config()) {
-    std::cout << config;
-    exit(EXIT_SUCCESS);
-  }
 
   SVN* svn=NULL;

trunk/lib/main_utility.cc

@@ -25 +25 @@
 #include "utility.h"
 
+#include <cctype>
 #include <fstream>
+#include <iostream>
 #include <string>
 #include <stdexcept>
@@ -52 +54 @@
 
 
+  void write_config_and_exit(void)
+  {
+    std::cout << Configuration::instance();
+    exit(EXIT_SUCCESS);
+  }
 
 }} // end of namespace svndigest and namespace theplu

trunk/lib/main_utility.h

@@ -41 +41 @@
   void load_config(const std::string& file);
 
+  /**
+     write configuration file to cout and exit successfully
+   */
+  void write_config_and_exit(void);
+
 }} // end of namespace svndigest end of namespace theplu