Changeset 1207

Timestamp:

Mar 6, 2008, 12:56:42 AM (15 years ago)

Author:

Peter

Message:

fixes #282

Location:

trunk

Files:

• test/fileutil_test.cc (modified) (5 diffs)
• yat/utility/FileUtil.cc (modified) (3 diffs)
• yat/utility/FileUtil.h (modified) (2 diffs)
• yat/utility/OptionFile.cc (modified) (1 diff)

trunk/test/fileutil_test.cc

@@ -60 +60 @@
       *error << "\trx permissions on " << file.path() << std::endl;
     ok&=!testval;
+    if (!(testval=file.permissions("d")))
+      *error << "\td permissions on " << file.path() << std::endl;
+    ok&=!testval;
   }
   catch (utility::IO_error e) {
@@ -85 +88 @@
       *error << "\tw permission on " << file.path() << std::endl;
     ok&=!testval; // 'w' on non-existent file ok if directory writeable
+    if (!(testval=file.permissions("d")))
+      *error << "\td permission on " << file.path() << std::endl;
+    ok&=!testval; 
   }
   catch (utility::IO_error e) {
@@ -109 +115 @@
       *error << "\tw permission on " << file.path() << std::endl;
     ok&=!testval; // 'w' on non-existent file ok if directory writeable
+    if (!(testval=file.permissions("d")))
+      *error << "\td permission on " << file.path() << std::endl;
+    ok&=!testval; 
   }
   catch (utility::IO_error e) {
@@ -134 +143 @@
       *error << "\tw permission failed on " << file.path() << std::endl;
     ok&=testval;
+    if (testval=file.permissions("d"))
+      *error << "\td permission failed on " << file.path() << std::endl;
+    ok&=testval; 
   }
   catch (utility::IO_error e) {
@@ -160 +172 @@
   }
 
+  try {
+    *error << "FileUtil Test 6" << std::endl;
+    utility::FileUtil file("fileutil_test.cc");
+    file.permissions("rxwa"); // should throw
+    ok = false; 
+  }
+  catch (std::invalid_argument& e) {
+    *error << "Expected exception thrown with what: " << e.what() << std::endl;
+  }
+
+  
   
 

trunk/yat/utility/FileUtil.cc

@@ -28 +28 @@
 #include <cerrno>
 #include <iostream>
+#include <stdexcept>
 #include <string>
 
@@ -54 +55 @@
 
     int mode=0;
+    bool ok = true;
     for (u_int i=0; i<bits.length(); i++)
       switch (bits[i]) {
-          case 'r':
+          case 'r':
             mode|=R_OK;
             break;
@@ -65 +67 @@
             mode|=X_OK;
             break;
+          case 'd':
+            struct stat nodestat;
+            stat(tryme.c_str(),&nodestat);
+            if (!S_ISDIR(nodestat.st_mode))
+              ok = false;
+            break;
+          default:
+            throw std::invalid_argument("FileUtil::permission: "+bits);
       }
-
+    if (!ok)
+      return -1;
     return access(tryme.c_str(),mode);
   }

trunk/yat/utility/FileUtil.h

@@ -56 +56 @@
     ///
     /// Check if access permissions match \a mode. \a mode must be
-    /// given as r, w, x, or combinations of these letters. The check
-    /// is performed att call time.
+    /// given as r, w, x, d, or combinations of these letters. The check
+    /// is performed at call time.
     ///
     /// \note Checking permissions on a non-existent file will match
@@ -69 +69 @@
     /// is returned, and errno is set appropriately.
     ///
-    /// \exception Throws whatever exists() throws.
+    /// \exception IO_error if exists() throws.
+    /// \exception std::invalid_argument if \a bits contain other
+    /// character than r, w, x, or d.
     ///
     int permissions(const std::string& bits) const;

trunk/yat/utility/OptionFile.cc

@@ -68 +68 @@
           throw cmd_error(ss.str());
         }
+        else if (*iter=='d' && fu.permissions("d")){
+          std::stringstream ss;
+          ss << value() 
+             << "': Not a directory";
+          throw cmd_error(ss.str());
+        }
       }
       std::stringstream ss;