Changes from tags/release-0.4/bin at r1638 to tags/release-0.5/bin at r1638

Location:

tags/release-0.5/bin

Files:

• Makefile.am (modified) (1 diff)
• Parameter.cc (modified) (3 diffs)
• Parameter.h (modified) (2 diffs)
• svndigest.cc (modified) (7 diffs)

tags/release-0.5/bin/Makefile.am

@@ -28 +28 @@
 noinst_HEADERS = Parameter.h
 
-LDADD = @top_srcdir@/lib/libsvndigest.a -L$(APR_PATH)/lib -L$(SVN_PATH)/lib \
-  -lsvn_client-1 -lsvn_diff-1 -lsvn_wc-1 -lsvn_ra-1 -lsvn_subr-1 -lapr-0
+LDADD =  $(STATICFLAG) @top_srcdir@/lib/libsvndigest.la
 
-INCLUDES = -I@top_srcdir@/lib \
-  -I$(SVN_PATH)/include/subversion-1 -I$(APR_PATH)/include/apr-0
+AM_CPPFLAGS = -I@top_srcdir@/lib
 
 clean-local: 

tags/release-0.5/bin/Parameter.cc

@@ -37 +37 @@
   {
     defaults();
-    for (int i=1; i<argc; i++) {
+    for (int i=1; i<argc; ++i) {
       bool ok=false;
       std::string myargv(argv[i]);
@@ -72 +72 @@
           exit(0);
       }
+      else if (myargv=="-vf" || myargv=="-fv"){
+          verbose_=true;
+          force_=true;
+          ok=true;
+      }
 
       if (!ok)
@@ -84 +89 @@
   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);
   }
 

tags/release-0.5/bin/Parameter.h

@@ +1 @@
+#ifndef _theplu_svndigest_parameter_
+#define _theplu_svndigest_parameter_
+
 // $Id$
 
@@ -21 +24 @@
   02111-1307, USA.
 */
-
-#ifndef _theplu_svndigest_parameter_
-#define _theplu_svndigest_parameter_
 
 #include <string>

tags/release-0.5/bin/svndigest.cc

@@ -13 +13 @@
   svndigest is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
@@ -26 +26 @@
 #include "Directory.h"
 #include "GnuplotFE.h"
+#include "html_utility.h"
 #include "rmdirhier.h"
 #include "SVN.h"
@@ -37 +38 @@
 #include <unistd.h>
 
-using namespace std;
+///
+/// @brief Check whether \a path already exists or not.
+///
+/// @return True if \a path exists, false otherwise.
+///
+bool check_target(const std::string& path)
+{
+  struct stat buf;
+  return !stat(path.c_str(),&buf);
+}
+
 
 int main(const int argc,const char* argv[])
@@ -62 +73 @@
   }
 
+  // check if target already exists and behave appropriately
+  std::string target_path=option->targetdir() + '/' + file_name(option->root());
+  bool need_to_erase_target = check_target(target_path);
+  if (need_to_erase_target && !option->force())
+    throw std::runtime_error(std::string("svndigest: directory (") +
+                             target_path + ") already exists");
+
   // Extract repository location
   std::string repo;
@@ -74 +92 @@
   }
 
+  // build directory tree already here ... if WC is upto date with
+  // repo an exception is thrown. This avoids several costly
+  // statements below and will not remove a digest tree below if a
+  // tree already exists.
+  Directory tree(0,option->root(),"");
+  tree.parse(option->verbose());
+
   // Retrieve commit dates.
   std::vector<std::string> commit_dates;
@@ -85 +110 @@
   }
 
-  // check if target already exists and behave appropriately
-  std::string root_path(option->targetdir()+'/'+file_name(option->root()));
-  struct stat buf;
-  if (!stat(root_path.c_str(),&buf))
-    // root_path already exists
-    if (option->force()) {
-      // force true -> removal of root_path
+  // remove target if needed
+  if (need_to_erase_target) {
       if (option->verbose())
-        std::cout << "rm -rf " << root_path << "\n";
-      rmdirhier(root_path);
-    }
-    else {
-      // force false -> exit 
-      std::cerr << "\nsvndigest: " << root_path << ": directory already exists"
-                << std::endl;
-      exit(-1);
-    }
+        std::cout << "rm -rf " << target_path << "\n";
+      rmdirhier(target_path);
+  }
 
   if (!option->revisions())
     GnuplotFE::instance()->set_dates(commit_dates);
-
-  Directory tree(0,option->root(),"");
-  tree.parse(option->verbose());
-
-  GnuplotFE::instance()->command(string("cd '")+option->targetdir()+"'");
+  GnuplotFE::instance()->command(std::string("cd '")+option->targetdir()+"'");
   chdir(option->targetdir().c_str());
   try {
@@ -125 +135 @@
   exit(0);        // normal exit
 }
-
-