Changeset 1186

Timestamp:

Aug 28, 2010, 12:13:37 AM (13 years ago)

Author:

Peter Johansson

Message:

using errno_error. closes #410

Location:

trunk

Files:

• bin/svndigest.cc (modified) (1 diff)
• bin/svndigestParameter.cc (modified) (1 diff)
• lib/Directory.cc (modified) (1 diff)
• lib/File.cc (modified) (1 diff)
• lib/Node.cc (modified) (1 diff)
• lib/rmdirhier.cc (modified) (1 diff)
• lib/utility.cc (modified) (3 diffs)
• lib/utility.h (modified) (1 diff)

trunk/bin/svndigest.cc

@@ -228 +228 @@
     std::cout << "Generating output" << std::endl;
   mkdir(tree.name());
-  chdir(tree.name().c_str());
+  chdir(tree.name());
   print_css("svndigest.css");
   print_main_page(tree.name(), tree.log(), stats, tree.url());

trunk/bin/svndigestParameter.cc

@@ -93 +93 @@
         std::string base_root = file_name(root());
         std::string path = concatenate_path(target_.value(),base_root); 
-        if (access_rights(target_.value().c_str(), "w")) {
+        if (access_rights(target_.value(), "w")) {
           std::stringstream ss;
           ss << "svndigest: cannot create directory `" << path 

trunk/lib/Directory.cc

@@ -78 +78 @@
         case SVN::uptodate:
           struct stat nodestat;                // C api from sys/stat.h
-          lstat(fullpath.c_str(),&nodestat);   // C api from sys/stat.h
+          lstat(fullpath,&nodestat);   // C api from sys/stat.h
           if (S_ISDIR(nodestat.st_mode))       // C api from sys/stat.h
             daughters_.push_back(new Directory(level_+1,fullpath,local_path()));

trunk/lib/File.cc

@@ -225 +225 @@
     stats_.print(os);
     os.close();
-    rename(tmp_cache_file.c_str(), cache_file.c_str());
+    rename(tmp_cache_file, cache_file);
     return stats_;
   }

trunk/lib/Node.cc

@@ -63 +63 @@
 
     struct stat nodestat;                // C api from sys/stat.h
-    lstat(path.c_str(),&nodestat);   // C api from sys/stat.h
+    lstat(path,&nodestat);   // C api from sys/stat.h
     link_ = S_ISLNK(nodestat.st_mode);
   }

trunk/lib/rmdirhier.cc

@@ -70 +70 @@
     struct stat buf;
     // using lstat because links should not be treated as dirs
-    lstat(dir.c_str(),&buf);
+    lstat(dir, &buf);
     // check if dir - if not delete the node
     if (!(buf.st_mode & S_IFDIR)) {

trunk/lib/utility.cc

@@ -170 +170 @@
 
 
+  void lstat(const std::string path, struct stat* nodestat)
+  {
+    int res = ::lstat(path.c_str(), nodestat);
+    if (res) {
+      throw yat::utility::errno_error("lstat: ");
+    }
+  }
+
+
   std::string ltrim(std::string str)
   {
@@ -183 +192 @@
     if (code){
       std::stringstream ss;
-      ss << "mkdir(" << dir << "): failed\n" << strerror(errno);
-      throw std::runtime_error(ss.str());
+      ss << "mkdir: `" << dir << "': ";
+      throw yat::utility::errno_error(ss.str());
     }
   }
@@ -294 +303 @@
     if (code){
       std::stringstream ss;
-      ss << "rename(" << from << ", " << to << "): failed\n" << strerror(errno);
-      throw std::runtime_error(ss.str());
+      ss << "rename" << from << " to " << to << ": ";
+      throw yat::utility::errno_error(ss.str());
     }
   }

trunk/lib/utility.h

@@ -115 +115 @@
   ///
   std::string htrim(std::string str);
+
+  /**
+     same as lstat(2) but throws an errno_error if error is detected
+   */
+  void lstat(const std::string path, struct stat*);
 
   ///