Changeset 626 for trunk

Timestamp:

Apr 24, 2008, 1:05:09 AM (14 years ago)

Author:

Peter Johansson

Message:

fixed #266

Location:

trunk/bin

Files:

• Parameter.cc (modified) (5 diffs)
• Parameter.h (modified) (1 diff)

trunk/bin/Parameter.cc

@@ -47 +47 @@
   {
     for (int i=1; i<argc; ++i) {
-      bool ok=false;
       std::stringstream ss(argv[i]);
       std::string myargv("");
@@ -57 +56 @@
         if (value.size()) {
           config_file_.value()= value;
-          ok=true;
         }
         else if (++i<argc){
           config_file_.value()= std::string(argv[i]);
-          ok=true;
+        }
+        else {
+          missing_argument(myargv);
         }
       }
       else if (myargv=="--copyright"){
           copyright_.value()=true;
-          ok=true;
       }
       else if (myargv=="-f" || myargv=="--force"){
           force_.value()=true;
-          ok=true;
       }
       else if (myargv=="-g" || myargv=="--generate-config"){
           generate_config_.value()=true;
-          ok=true;
       }
       else if (myargv=="-h" || myargv=="--help"){
@@ -82 +79 @@
       else if (myargv=="--ignore-cache"){
           ignore_cache_.value()=true;
-          ok=true;
       }
       else if (myargv=="-r" || myargv=="--root"){
         if (value.size()) {
           root_.value()= value;
-          ok=true;
         }
         else if (++i<argc){
           root_.value()= std::string(argv[i]);
-          ok=true;
+        }
+        else {
+          missing_argument(myargv);
         }
       }
       else if (myargv=="--report") {
           report_.value()=true;
-          ok=true;
       }
       else if (myargv=="--no-report") {
           report_.value()=false;
-          ok=true;
       }
       else if (myargv=="--revisions") {
           revisions_.value()=true;
-          ok=true;
       }
       else if (myargv=="-t" || myargv=="--target"){
         if (value.size()) {
           targetdir_.value()= value;
-          ok=true;
         }
         else if (++i<argc){
           targetdir_.value()= std::string(argv[i]);
-          ok=true;
+        }
+        else {
+          missing_argument(myargv);
         }
       }
       else if (myargv=="-v" || myargv=="--verbose"){
           verbose_.value()=true;
-          ok=true;
       }
       else if (myargv=="--version"){
@@ -127 +121 @@
           verbose_.value()=true;
           force_.value()=true;
-          ok=true;
-      }
-
-      if (!ok)
+      }
+      else {
         throw std::runtime_error("svndigest: invalid option: " + myargv +
                                  "\nTry `svndigest --help' for usage.");
-    }
+      } 
+  }
 
     analyse();
@@ -241 +234 @@
 
 
+  void Parameter::missing_argument(std::string opt) const
+  {
+    if (opt.size()>0 && opt[0]=='-')
+      opt = opt.substr(1);
+    if (opt.size()>0 && opt[0]=='-')
+      opt = opt.substr(1);
+    std::stringstream ss;
+    ss << "svndigest: option requires an argument -- " << opt << "\n"
+       << "Try `svndigest --help' for usage."; 
+    throw std::runtime_error(ss.str());
+  }
+
   void Parameter::version(bool verbose) const
   {

trunk/bin/Parameter.h

@@ -56 +56 @@
     void analyse(void);
     void help(void) const;
+    void missing_argument(std::string opt) const;
     void version(bool=false) const;