Changeset 1428

Timestamp:

Dec 17, 2011, 1:37:06 AM (11 years ago)

Author:

Peter Johansson

Message:

simplify rmdirhier using new DirectoryUtil?

Location:

trunk/lib

Files:

• rmdirhier.cc (modified) (3 diffs)
• rmdirhier.h (modified) (1 diff)

trunk/lib/rmdirhier.cc

@@ -23 +23 @@
 
 #include "rmdirhier.h"
+#include "DirectoryUtil.h"
 #include "utility.h"
+
+#include "yat/Exception.h"
 
 #include <cstdio>
@@ -38 +41 @@
 namespace svndigest {
 
-  void rmdirhier(const std::string& path)
-  {
-    int fd=open(".",O_RDONLY);  // remember "original" cwd
-    void rmdirhier__(const std::string&);
-
-    try {
-      rmdirhier__(path);
-    }
-    catch(const BadDirectory& x) {
-      std::cerr << "svndigest: " << x.what() << "\n" 
-                << strerror(errno) << std::endl;
-    }
-    catch(const DirectoryOpenError& x) {
-      std::cerr << "svndigest: cannot open directory " << x.what() << "\n" 
-                << strerror(errno) << "\n";
-    }
-    catch(const FileDeleteError& x) {
-      std::cerr << "svndigest: cannot delete file " << x.what() << "\n"
-                << strerror(errno) << "\n";
-    }
-    catch(const DirectoryDeleteError& x) {
-      std::cerr << "svndigest: cannot delete directory " << x.what() << "\n"
-                << strerror(errno) << "\n";
-    }
-
-    fchdir(fd); // return to "original" cwd
-  }
-
-
-  void rmdirhier__(const std::string& dir)
+  void rmdirhier(const std::string& dir)
   {
     struct stat buf;
@@ -76 +50 @@
       // Make sure file is removable before removing it
       chmod(dir.c_str(),S_IWRITE);
-      if (::remove(dir.c_str()))
-        throw FileDeleteError(concatenate_path(pwd(),dir));
+      remove(dir);
       return;
     }
-    if (::chdir(dir.c_str()))
-      throw BadDirectory(concatenate_path(pwd(),dir));
 
    // Delete any remaining directory entries
-    DIR* dp;
-    struct dirent *entry;
-    if (!(dp=opendir(".")))
-      throw DirectoryOpenError(concatenate_path(pwd(),dir));
-    while ((entry=readdir(dp)) != NULL) {
-      if ((std::string(entry->d_name) == ".") ||
-          (std::string(entry->d_name) == ".."))
+    DirectoryUtil du(dir);
+    for (DirectoryUtil::const_iterator node=du.begin(); node!=du.end();++node){
+      if ((file_name(node->path())==".") || (file_name(node->path())==".."))
         continue;
-      rmdirhier__(entry->d_name);
+      rmdirhier(node->path());
     }
-    closedir(dp);
 
     // Remove the directory from its parent
-    chdir("..");
-    if (::remove(dir.c_str()))
-      throw DirectoryDeleteError(concatenate_path(pwd(),dir));
+    remove(dir);
   }
 

trunk/lib/rmdirhier.h

@@ -24 +24 @@
 */
 
-#include <stdexcept>
 #include <string>
 
 namespace theplu {
 namespace svndigest {
-
-  struct DirectoryError : public std::runtime_error
-  { inline DirectoryError(const std::string& s) : runtime_error(s) {} };
-
-  struct BadDirectory : public DirectoryError
-  { inline BadDirectory(const std::string& s) : DirectoryError(s) {} };
-
-  struct DirectoryOpenError : public DirectoryError
-  { inline DirectoryOpenError(const std::string& s) : DirectoryError(s) {} };
-
-  struct FileDeleteError : public DirectoryError
-  { FileDeleteError(const std::string& s) : DirectoryError(s) {} };
-
-  struct DirectoryDeleteError : public DirectoryError
-  { DirectoryDeleteError(const std::string& s) : DirectoryError(s) {} };
 
   void rmdirhier(const std::string& path);