Changeset 151

Timestamp:

Aug 13, 2006, 10:30:02 PM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixes #50 and #58. Added checks that dirs exists and have proper permissions.

Location:

trunk

Files:

• bin/Parameter.cc (modified) (1 diff)
• lib/utility.cc (modified) (4 diffs)
• lib/utility.h (modified) (1 diff)

trunk/bin/Parameter.cc

@@ -84 +84 @@
   void Parameter::analyse(void)
   {
-    // making root absolute
-    std::string workdir(pwd());
-    chdir(root_.c_str());
+    using namespace std;
+
+    string workdir(pwd()); // remember current working directory (cwd).
+
+    // Checking that root_ exists and retrieve the absolute path to root_
+    if (chdir(root_.c_str()))
+      throw runtime_error(string("svndigest: Root directory (") + root_ +
+                          ") access failed.");
     root_ = pwd();
-    // remove trailing '/'
-    if (*root_.rbegin()=='/')
-      root_.erase(root_.begin()+root_.size()-1);
-    chdir(workdir.c_str());
 
-    // making targetdir absolute
-    chdir(targetdir_.c_str());
+    // need to get back to cwd if relative paths are used.
+    if (chdir(workdir.c_str()))
+      runtime_error(string("svndigest: Failed to access cwd: ") + workdir);
+
+    // Checking that targetdir_ exists and retrieve the absolute path
+    // to targetdir_
+    if (chdir(targetdir_.c_str()))
+      throw runtime_error(string("svndigest: Target directory (") + targetdir_ +
+                          ") access failed.");
     targetdir_ = pwd();
-    // remove trailing '/'
-    if (*targetdir_.rbegin()=='/')
-      root_.erase(targetdir_.begin()+targetdir_.size()-1);
-    chdir(workdir.c_str());
+    // Checking write permissions for targetdir_
+    if (access_rights(targetdir_,"w"))
+      throw runtime_error(string("svndigest: No write permission on target ") +
+                                 "directory (" + targetdir_ +").");
 
-    struct stat buf;
-    // check that root directory exists
-    if (stat(root_.c_str(),&buf))
-      throw std::runtime_error("\nsvndigest: " + root_ + ": No such directory.");
-
-    // check that target directory exists
-    if (stat(targetdir_.c_str(),&buf)){
-      throw std::runtime_error("\nsvndigest: " + targetdir_ + 
-                               ": No such directory.");
-    }
-
+    // return back to cwd
+    if (chdir(workdir.c_str()))
+      runtime_error(string("svndigest: Failed to access cwd: ") + workdir);
   }
 

trunk/lib/utility.cc

@@ -27 +27 @@
 #include <iostream> // remove this when 'blame' is removed
 #include <sstream>
+#include <stdexcept>
 #include <string>
 #include <sys/param.h>
@@ -33 +34 @@
 namespace theplu{
 namespace svndigest{
+
+  int access_rights(const std::string& path, const std::string& bits)
+  {
+    if (int value=access(path.c_str(),F_OK)) {
+      throw std::runtime_error(std::string("access_rights: ") + path +
+                               "' does not exist.");
+    }
+    int mode=0;
+    for (u_int i=0; i<bits.length(); i++)
+      switch (bits[i]) {
+          case 'r':
+            mode|=R_OK;
+            break;
+          case 'w':
+            mode|=W_OK;
+            break;
+          case 'x':
+            mode|=X_OK;
+            break;
+      }
+    return access(path.c_str(),mode);
+  }
+
 
   std::string file_name(const std::string& full_path)
@@ -41 +65 @@
     return name;
   }
+
 
   void print_css(std::ostream& s)
@@ -130 +155 @@
   {
     char buffer[MAXPATHLEN];
-    getcwd(buffer, MAXPATHLEN);
+    if (!getcwd(buffer, MAXPATHLEN))
+      throw std::runtime_error("Failed to get current working directory");
     return std::string(buffer);
   }
 
-
-
 }} // end of namespace svndigest and namespace theplu

trunk/lib/utility.h

@@ -36 +36 @@
 namespace theplu{
 namespace svndigest{
+
+  ///
+  /// @brief Check if access permissions match \a mode. \a mode must
+  /// be given as r, w, x, or combinations of these letters.
+  ///
+  /// @return On success (all requested permissions granted), zero
+  /// is returned. On error (at least one bit in mode asked for a
+  /// permission that is denied, or some other error occurred), -1
+  /// is returned, and errno is set appropriately.
+  ///
+  /// @throw An std::runtime_error is thrown when checking for write
+  /// permissions for a file/direcotry that does not exist.
+  ///
+  /// @see access(2)
+  ///
+  int access_rights(const std::string& path,const std::string& bits);
 
   ///