Changeset 1052

Timestamp:

Apr 18, 2010, 4:39:57 AM (11 years ago)

Author:

Peter Johansson

Message:

refs #450. using fnmatch in codon fil name pattern match.

Location:

trunk

Files:

• lib/Configuration.cc (modified) (5 diffs)
• lib/Configuration.h (modified) (1 diff)
• lib/utility.cc (modified) (3 diffs)
• lib/utility.h (modified) (1 diff)
• test/config_test.cc (modified) (1 diff)
• test/utility_test.cc (modified) (4 diffs)

trunk/lib/Configuration.cc

@@ -83 +83 @@
   Configuration::codon(std::string file_name) const 
   {
+    std::cout << "file_name: " << file_name << std::endl;
     if (const std::pair<std::string,std::string>* dict=dictionary(file_name))
       file_name = translate(file_name, *dict);
     for (String2Codons::const_iterator i(string2codons_.begin());
          i!=string2codons_.end(); ++i) {
-      if (svndigest::equal(file_name.begin(), file_name.end(), 
-                           i->first.begin(), i->first.end()) ) {
+      if (fnmatch(i->first.c_str(), file_name.c_str()))
         return &i->second;
-      }
     }
     return NULL;
@@ -106 +105 @@
   {
     for (size_t i=0; i<dictionary_.size(); ++i)
-      if (svndigest::equal(lhs.begin(), lhs.end(), 
-                           dictionary_[i].first.begin(),
-                           dictionary_[i].first.end()))
+      if (fnmatch(lhs.c_str(), dictionary_[i].first.c_str()))
         return &dictionary_[i];
     return NULL;
@@ -230 +227 @@
           for (String2Codons::const_iterator i(string2codons_.begin());
                i!=string2codons_.end(); ++i) {
-            if (svndigest::equal(lhs.begin(), lhs.end(), 
-                                 i->first.begin(), i->first.end()) ) {
+            if (fnmatch(lhs.c_str(), i->first.c_str())) {
               mess << "`" << i->first << "'";
               break;
@@ -370 +366 @@
                            const std::pair<std::string, std::string>& dic) const
   {
-    assert(svndigest::equal(str.begin(), str.end(),
-                            dic.first.begin(), dic.first.end()));
     std::string res;
     std::vector<std::string> vec;
-    regexp(str.begin(), str.end(), dic.first.begin(), dic.first.end(), vec);
+    if (!regexp(str.begin(), str.end(), dic.first.begin(),dic.first.end(),vec)){
+      std::stringstream mess;
+      mess << "svndigest: invalid config file: "
+           << "expression " << dic.first << " is invalid";
+      throw std::runtime_error(mess.str());       
+    }
     for (std::string::const_iterator i(dic.second.begin()); 
          i!=dic.second.end(); ++i) {
@@ -387 +386 @@
           if (n)
             mess << "because " << n << " is a too large.";
-          throw std::runtime_error("");       
+          throw std::runtime_error(mess.str());       
         }
         res += vec[n-1];

trunk/lib/Configuration.h

@@ -141 +141 @@
        Translate string \a str using dictionary \a dict
 
-       \note \a str must be equal to d.first (see function equal), 
+       \note \a str must be equal to d.first (see fnmatch), 
        or behavior is unspecified.
 

trunk/lib/utility.cc

@@ -30 +30 @@
 #include <cstdlib>
 #include <cstring>
+#include <fnmatch.h>
 #include <fstream>
 #include <sstream>
@@ -106 +107 @@
 
 
-  bool equal(std::string::const_iterator first1, 
-             std::string::const_iterator end1,
-             std::string::const_iterator first2,
-             std::string::const_iterator end2)
-  {
-    if (first1==end1 && first2==end2)
-      return true;
-    if (first1!=end1 && first2!=end2 && 
-        (*first1==*first2 || *first1=='*' || *first2=='*' ||
-         *first1=='?' || *first2=='?') && 
-        equal(first1+1, end1, first2+1, end2) )
-      return true;
-    if ( (first1!=end1 && first2!=end2 && (*first1=='*'|| *first2=='*') ) && 
-         (equal(first1+1, end1, first2, end2) || 
-          equal(first1, end1, first2+1, end2))
-         )
-      return true;
-    return false;
-  }
-
-
   std::string file_name(const std::string& full_path)
   {
@@ -163 +143 @@
       --length;
     return str.substr(0,length);
+  }
+
+
+  bool fnmatch(const std::string& pattern, const std::string& str)
+  {
+    int res = ::fnmatch(pattern.c_str(), str.c_str(), FNM_PERIOD);
+    if (res==0)
+      return true;
+    if (res!=FNM_NOMATCH) {
+      std::stringstream ss;
+      ss << "svndigest: fnmatch with args: " << pattern << ", " << str;
+      throw std::runtime_error(ss.str());
+    }                     
+    return false;
   }
 

trunk/lib/utility.h

@@ -78 +78 @@
   std::string directory_name(std::string path);
 
-  /**
-     Function to compare strings. Strings may contain '*'.
-
-     \return true if \a a and \a b are identical. 
-   */
-  bool equal(std::string::const_iterator first1, 
-             std::string::const_iterator end1,
-             std::string::const_iterator first2,
-             std::string::const_iterator end2);
-
   ///
   /// @return everything after last '/'
   ///
   std::string file_name(const std::string&);
+
+  /**
+     \return true if \a str matches \a pattern
+
+     \see fnmatch(3)
+   */
+  bool fnmatch(const std::string& pattern, const std::string& str);
 
   ///

trunk/test/config_test.cc

@@ -59 +59 @@
       suite.add(false);
     }
-    if (!c.codon("../dir/test.cc")){
+    if (!c.codon("/dir/test.cc")){
       suite.out() << "No codon for test.cc\n";
       suite.add(false);

trunk/test/utility_test.cc

@@ -29 +29 @@
 
 bool test_hex(int, unsigned int, std::string);
-bool test_equal(bool, std::string, std::string);
+bool test_fnmatch(bool, std::string, std::string);
 bool test_regexp(bool, std::string, std::string, 
                  const std::vector<std::string>&);
@@ -41 +41 @@
   ok &= test_hex(16,2, "10"); 
 
-  ok &= test_equal(true,"peter", "peter"); 
-  ok &= test_equal(false,"peter", "peterj"); 
-  ok &= test_equal(true,"p*", "peterj"); 
-  ok &= test_equal(true,"peter", "p*"); 
-  ok &= test_equal(false,"peter", "p*j"); 
-  ok &= test_equal(true,"peter", "*peter"); 
+  ok &= test_fnmatch(true,"peter", "peter"); 
+  ok &= test_fnmatch(false,"peter", "peterj"); 
+  ok &= test_fnmatch(true,"p*", "peterj"); 
+  ok &= test_fnmatch(true, "p*", "peter"); 
+  ok &= test_fnmatch(false, "p*j", "peter"); 
+  ok &= test_fnmatch(true, "*peter", "peter"); 
+
+  ok &= test_fnmatch(true, "filename", "filename");
+  ok &= test_fnmatch(true, "*name", "filename");
+  ok &= test_fnmatch(true, "[fa]il?name", "filename");
+  ok &= test_fnmatch(true, "*name", "/path/to/filename");
+  ok &= test_fnmatch(true, "*name", "file.name");
+  // posix dictates that leading persion can not be matched by wildcard
+  ok &= test_fnmatch(false, "*.txt", ".file.txt");
 
   std::vector<std::string> vec;
@@ -69 +77 @@
 }
 
-bool test_equal(bool answ, std::string a, std::string b)
+bool test_fnmatch(bool answ, std::string a, std::string b)
 {
-  if (theplu::svndigest::equal(a.begin(), a.end(), b.begin(), b.end())==answ)
+  using namespace theplu::svndigest;
+  bool res = fnmatch(a.c_str(), b.c_str());
+  if (res == answ)
     return true;
-  std::cerr << "equal(" << a << ", " << b << ") results "
-            << theplu::svndigest::equal(a.begin(), a.end(),b.begin(), b.end()) 
+  std::cerr << "fnmatch(" << a << ", " << b << ") results "
+            << res
             << ". Expects " << answ << std::endl;
   return false;
@@ -107 +117 @@
   }
   return true;
-
 }