Do less syscalls in mkpath

[libs/core.git] / source / fs / dir.cpp

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index bc7a8fec1b7fd9374c51dfa69165637341aad758..f7f34f668492383087c78ddb4f2627a4e551e38e 100644 (file)
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -1,11 +1,13 @@
 #include <cstdlib>
 #include <cerrno>
 #include <dirent.h>
-#include <sys/stat.h>
 #ifdef WIN32
 #include <shlobj.h>
+#else
+#include <unistd.h>
+#include <sys/stat.h>
 #endif
-#include <msp/core/except.h>
+#include <msp/core/systemerror.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
 #include "dir.h"
@@ -21,10 +23,8 @@ namespace FS {
 namespace
 {
 
-/**
-Helper function to determine the location of the program's executable.  Caches
-the last result to cut down filesystem access with repeated calls.
-*/
+/** Helper function to determine the location of the program's executable.
+Caches the last result to cut down filesystem access with repeated calls. */
 const Path &get_bin_dir(const string &argv0)
 {
        static string last_argv0;
@@ -56,19 +56,22 @@ const Path &get_bin_dir(const string &argv0)
 
 }
 
+
+not_a_directory::not_a_directory(const Path &p):
+       runtime_error(p.str())
+{ }
+
+
 void mkdir(const Path &path, int mode)
 {
-       int err;
 #ifdef WIN32
-       // The win32 version of this function doesn't take the mode argument.  Go figure.
        (void)mode;
-       err = ::mkdir(path.str().c_str());
+       if(!CreateDirectory(path.str().c_str(), NULL))
+               throw system_error("CreateDirectory");
 #else
-       err = ::mkdir(path.str().c_str(), mode);
+       if(::mkdir(path.str().c_str(), mode)==-1)
+               throw system_error("mkdir");
 #endif
-
-       if(err==-1)
-               throw SystemError("mkdir failed", errno);
 }
 
 void mkpath(const Path &path, int mode)
@@ -81,16 +84,12 @@ void mkpath(const Path &path, int mode)
                if(p.size()==1 && p.is_absolute())
                        continue;
 #endif
-               struct stat st;
-               int err = stat(p, st);
-               if(err==0)
+               if(FS::Stat st = stat(p))
                {
-                       if(!S_ISDIR(st.st_mode))
-                               throw Exception("A component exists and is not a directory");
+                       if(!st.is_directory())
+                               throw not_a_directory(p);
                        continue;
                }
-               else if(errno!=ENOENT)
-                       throw SystemError("stat failed", errno);
                else
                        mkdir(p, mode);
        }
@@ -98,19 +97,23 @@ void mkpath(const Path &path, int mode)
 
 void rmdir(const Path &path)
 {
+#ifdef WIN32
+       if(!RemoveDirectory(path.str().c_str()))
+               throw system_error("RemoveDirectory");
+#else
        if(::rmdir(path.str().c_str())==-1)
-               throw SystemError("rmdir failed", errno);
+               throw system_error("rmdir");
+#endif
 }
 
-void rmdirs(const Path &path)
+void rmpath(const Path &path)
 {
        list<string> files = list_files(path);
        for(list<string>::iterator i=files.begin(); i!=files.end(); ++i)
        {
                Path p = path / *i;
-               struct stat st = stat(p.str().c_str());
-               if(S_ISDIR(st.st_mode))
-                       rmdirs(p);
+               if(is_dir(p))
+                       rmpath(p);
                else
                        unlink(p);
        }
@@ -215,7 +218,7 @@ Path get_sys_lib_dir(const string &argv0, const string &appname)
 void chdir(const Path &path)
 {
        if(::chdir(path.str().c_str())==-1)
-               throw SystemError("chdir failed", errno);
+               throw system_error("chdir");
 }
 
 } // namespace FS