Changeset 632 for trunk/bin

Timestamp:

Apr 29, 2008, 12:37:07 AM (15 years ago)

Author:

Peter Johansson

Message:

working on #317

Location:

trunk/bin

Files:

• Parameter.cc (modified) (2 diffs)
• Parameter.h (modified) (2 diffs)

trunk/bin/Parameter.cc

@@ -44 +44 @@
     : config_file_(""), copyright_(false), force_(false), 
       generate_config_(false), ignore_cache_(false), report_(true),
-      revisions_(false), root_("."), targetdir_("."), verbose_(false)
+      revisions_(false), root_("."), root_node_("."), targetdir_("."), 
+      verbose_(false)
   {
     for (int i=1; i<argc; ++i) {
@@ -138 +139 @@
     string workdir(pwd()); // remember current working directory (cwd).
 
-    bool root_ok = ( node_exist(root_.value()) && 
-                     !access_rights(root_.value(), "r") );
-    
-    if (root_ok) {
-      // Check that root_ is a directory
-      struct stat nodestat;
-      stat(root_.value().c_str(), &nodestat);
-      if (!S_ISDIR(nodestat.st_mode))
-        throw runtime_error(string("svndigest: accessing `") + root_.value() +
-                            "': Not a directory.");
+    if (!node_exist(root_.value()))
+      throw runtime_error(string("svndigest: cannot stat `" + root_.value() +
+                                 "': no such file or directory"));
+
+    if (access_rights(root_.value(), "r"))
+      throw runtime_error(string("svndigest: cannot open `" + root_.value() +
+                                 "' for reading: Permission denied"));
+
+    // Check whether root is directory or file
+    struct stat nodestat;
+    stat(root_.value().c_str(), &nodestat);
+    if (S_ISDIR(nodestat.st_mode)) {
+      chdir(root_.value().c_str());
+      root_node_.value() = root_.value() = pwd();
     }
-
-    // Checking that root_ exists and retrieve the absolute path to root_
-    if (!root_ok || chdir(root_.value().c_str()))
-      throw runtime_error(string("svndigest: Root directory (") + root_.value() +
-                          ") access failed.");
-    root_.value() = pwd();
-
-      
+    else {
+      std::string fname = file_name(root_.value());
+      root_.value() = directory_name(root_.value());
+      chdir(root_.value().c_str());
+      root_.value() = pwd();
+      root_node_.value() = root_.value() + "/" + fname;
+    }
 
     // need to get back to cwd if relative paths are used.

trunk/bin/Parameter.h

@@ -48 +48 @@
     /// @return absolute path to root directory
     inline const std::string& root(void) const { return root_.value(); }
+    /// @return absolute path to root node
+    inline const std::string& root_node(void) const {return root_node_.value();}
     /// @return absolute path to target directory
     inline const std::string& targetdir(void) const 
@@ -67 +69 @@
     Option<bool> revisions_;
     Option<std::string> root_;
+    Option<std::string> root_node_;
     Option<std::string> targetdir_;
     Option<bool> verbose_;