Changeset 979

Timestamp:

Oct 21, 2007, 9:46:14 PM (15 years ago)

Author:

Peter

Message:

fixing bug in OptionFile?. Dont try to create FileUtil? for option not present in commandline

Location:

trunk

Files:

• test/commandline_test.cc (modified) (3 diffs)
• yat/utility/CommandLine.cc (modified) (1 diff)
• yat/utility/OptionFile.cc (modified) (4 diffs)
• yat/utility/OptionFile.h (modified) (2 diffs)

trunk/test/commandline_test.cc

@@ -34 +34 @@
 bool test_switch(std::ostream& error);
 bool test_arg(std::ostream& error);
+bool test_file(std::ostream& error);
 bool test_failures(std::ostream& error);
 
@@ -56 +57 @@
     ok &= test_switch(*error);
     ok &= test_arg(*error);
+    ok &= test_file(*error);
     ok &= test_failures(*error);
   }
@@ -342 +344 @@
 
 
-
-
-
-
+bool test_file(std::ostream& error)
+{
+  bool ok=true;
+  CommandLine cmd;
+  OptionFile inclones(cmd, "clones", "file containing clones");
+  OptionFile indata(cmd, "data", "data to merge");
+  OptionSwitch help(cmd, "h,help", "display this help and exit");
+
+  error << "Testing OptionFile... ";
+  {
+    int ac = 2;
+    char* av[] = { "test_prog", "-h" };
+    cmd.parse(ac,av);
+    error << "ok\n";
+  }
+  return ok;
+}
+
+
+
+
+

trunk/yat/utility/CommandLine.cc

@@ -159 +159 @@
     while (std::getline(ss, str, del)){
       vec.push_back(str);
-      std::cout << "split: push_back() " << vec.back() << std::endl;
     }
     return vec;

trunk/yat/utility/OptionFile.cc

@@ -34 +34 @@
   OptionFile::OptionFile(CommandLine& cmd, std::string flag, 
                          std::string desc, bool exist, std::string bits)
-    : OptionArg<char*>(cmd, flag, desc), exist_(exist), bits_(bits)
+    : OptionArg<std::string>(cmd, flag, desc), exist_(exist), bits_(bits)
   {
   }
@@ -41 +41 @@
   void OptionFile::do_validate() const
   {   
-    FileUtil fu(value());
+    if (!present())
+      return;
+    FileUtil fu(value().c_str());
     if (exist_ && !fu.exists()){
       std::stringstream ss;
@@ -47 +49 @@
       throw std::runtime_error(ss.str());
     }
-    // Peter, this loop is stupid but I wanna differentiate the error message
-    for (size_t i=0; i<bits_.length(); ++i)
-      switch (bits_[i]) {
-      case 'r':
-        if (fu.permissions("r")){
+    if (fu.permissions(bits_)) {
+      // Peter, this loop is stupid but I wanna differentiate the error message
+      for (std::string::const_iterator iter; iter!=bits_.end(); ++iter){
+        if (*iter=='r' && fu.permissions("r")){
           std::stringstream ss;
           ss << "cannot stat `" << value() << "': No such file or directory";
           throw std::runtime_error(ss.str());
         }
-        break;
-      case 'w':
-        if (fu.permissions("w")){
+        else if (*iter=='w' && fu.permissions("w")){
           std::stringstream ss;
           ss << "cannot create file `" << value() 
@@ -64 +63 @@
           throw std::runtime_error(ss.str());
         }
-        break;
-      case 'x':
-        if (fu.permissions("w")){
-          std::stringstream ss;
-          ss << value() << ": Permission denied";
-          throw std::runtime_error(ss.str());
-        }
-        break;
       }
+      std::stringstream ss;
+      ss << value() << ": Permission denied";
+      throw std::runtime_error(ss.str());
+    }
   }
 

trunk/yat/utility/OptionFile.h

@@ -37 +37 @@
      \brief Class for file related options
    */
-  class OptionFile : public OptionArg<char*>
+  class OptionFile : public OptionArg<std::string>
   {
   public:
@@ -44 +44 @@
        
        \param cmd Commandline Option is associated with
-       \param name string such as "file" for --file, "f" for -h or
+       \param name string such as "file" for --file, "f" for -f or
        "f,file" for having both short and long option name
        \param desc string used in help display
        \param exist if true File must exist
-       \param bits used to check permission on file, @see
-       FileUtil::permission
+       \param bits used to check permission on file, see
+       FileUtil
     */
     OptionFile(CommandLine& cmd, std::string name,