Changeset 571 for branches

Timestamp:

Mar 14, 2008, 11:00:26 PM (15 years ago)

Author:

Peter Johansson

Message:

more specific error message when root is not a directory - see ticket:311

File:

• branches/0.6-stable/bin/Parameter.cc (modified) (1 diff)

branches/0.6-stable/bin/Parameter.cc

@@ -128 +128 @@
     string workdir(pwd()); // remember current working directory (cwd).
 
+    bool root_ok = node_exist(root_) && !access_rights(root_, "r");
+    
+    if (root_ok) {
+      // Check that root_ is a directory
+      struct stat nodestat;
+      stat(root_.c_str(), &nodestat);
+      if (!S_ISDIR(nodestat.st_mode))
+        throw runtime_error(string("svndigest: accessing `") + root_ +
+                            "': Not a directory.");
+    }
+
     // Checking that root_ exists and retrieve the absolute path to root_
-    if (chdir(root_.c_str()))
+    if (!root_ok || chdir(root_.c_str()))
       throw runtime_error(string("svndigest: Root directory (") + root_ +
                           ") access failed.");
     root_ = pwd();
+
+      
 
     // need to get back to cwd if relative paths are used.