Changeset 475 for trunk/bin

Timestamp:

Aug 31, 2007, 3:27:33 PM (16 years ago)

Author:

Peter Johansson

Message:

Merged patch release 0.6.3 to trunk. Delta 0.6.3 - 0.6.2

File:

• trunk/bin/Parameter.cc (modified) (5 diffs)

trunk/bin/Parameter.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/trac/svndigest
@@ -43 +43 @@
     for (int i=1; i<argc; ++i) {
       bool ok=false;
-      std::string myargv(argv[i]);
+      std::stringstream ss(argv[i]);
+      std::string myargv("");
+      std::string value("");
+      getline(ss, myargv, '=');
+      getline(ss, value);
+
       if (myargv=="--config-file"){
-        if (++i<argc){
+        if (value.size()) {
+          config_file_= value;
+          ok=true;
+        }
+        else if (++i<argc){
           config_file_= std::string(argv[i]);
           ok=true;
@@ -67 +76 @@
       }
       else if (myargv=="-r" || myargv=="--root"){
-        if (++i<argc){
+        if (value.size()) {
+          root_= value;
+          ok=true;
+        }
+        else if (++i<argc){
           root_= std::string(argv[i]);
           ok=true;
@@ -85 +98 @@
       }
       else if (myargv=="-t" || myargv=="--target"){
-        if (++i<argc){
+        if (value.size()) {
+          targetdir_= value;
+          ok=true;
+        }
+        else if (++i<argc){
           targetdir_= std::string(argv[i]);
           ok=true;
@@ -219 +236 @@
     cs.width(0)=79;
     cs << PACKAGE_STRING
-       << "\nCopyright (C) 2007 Jari Häkkinen and Peter Johansson.\n\n"
+       << "\nCopyright (C) 2007 Jari Häkkinen and Peter Johansson.\n\n"
        << "This is free software; see the source for copying conditions. "
        << "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR "