Changeset 784 for branches/replacing_gnuplot/lib/utility.cc

Timestamp:

Apr 9, 2009, 10:18:54 PM (14 years ago)

Author:

Jari Häkkinen

Message:

Merged trunk changes r645:782 to replacing_gnuplot branch.

Location:

branches/replacing_gnuplot

Files:

• . (modified) (1 prop)
• lib/utility.cc (modified) (8 diffs)

branches/replacing_gnuplot

@@ -8 +8 @@
 autom4te.cache
 INSTALL
-COPYING
 aclocal.m4
 Makefile

@@ -8 +8 @@
 autom4te.cache
 INSTALL
-COPYING
 aclocal.m4
 Makefile

branches/replacing_gnuplot/lib/utility.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
-
-  This file is part of svndigest, http://trac.thep.lu.se/svndigest
+  Copyright (C) 2006, 2007, 2009 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
+
+  This file is part of svndigest, http://dev.thep.lu.se/svndigest
 
   svndigest is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  the Free Software Foundation; either version 3 of the License, or
   (at your option) any later version.
 
@@ -17 +18 @@
 
   You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
+  along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -29 +28 @@
 #include <cassert>
 #include <cerrno> 
+#include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <fstream>
 #include <sstream>
@@ -35 +36 @@
 #include <string>
 #include <sys/param.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
@@ -65 +67 @@
 
 
+  std::string concatenate_path(std::string dir, std::string base)
+  {
+    if (dir.empty() || dir==".")
+      return base;
+    if (dir[dir.size()-1]!='/')
+      dir.append("/");
+    return dir+base;
+  }
+
+
   void copy_file(const std::string& source, const std::string& target)
   {
@@ -87 +99 @@
   {
     size_t pos = path.find_last_of("/");
+    if (pos==std::string::npos)
+      return ".";
     if (pos==path.size()-1)
       return directory_name(path.substr(0,path.size()-2));
@@ -180 +194 @@
     if (code){
       std::stringstream ss;
-      ss << "mkdir(" << dir << "): failed with error code: errno=" << errno;
+      ss << "mkdir(" << dir << "): failed\n" << strerror(errno);
       throw std::runtime_error(ss.str());
     }
@@ -324 +338 @@
 
 
-  std::string version_string(void)
-  {
-    std::stringstream ss;
-    ss << " (";
-    if (DEV_BUILD)
-      ss << "r" << svn_revision() << " ";
-    ss << "compiled " << compilation_time() << ", " << compilation_date() 
-       << ")";
-    return ss.str();
-  }
-
-
   std::string match(std::string::const_iterator& first,
                     const std::string::const_iterator& last,

@@ -8 +8 @@
 autom4te.cache
 INSTALL
-COPYING
 aclocal.m4
 Makefile